Fix MN103 installation and VC4 tests in CI

Bumps [iced-x86](https://github.com/icedland/iced) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/icedland/iced/releases)
- [Commits](https://github.com/icedland/iced/compare/v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: iced-x86
  dependency-version: 1.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/x86iced"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+  
+  pull_request:
+
+
+jobs:
+
+  build-extras:
+    name: Build radare2 extras and r2pipe
+    runs-on: ubuntu-22.04
+    env:
+      EXTERNAL_BUILDS: 'keystone-lib unicorn-lib'
+      LOCAL_BUILDS: 'asahi blackfin blessr2 keystone microblaze ppcdisasm r2svd vc4 x86iced'
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        repository: radareorg/radare2
+        ref: master
+        path: ./radare2
+    - uses: radareorg/github-actions@v3
+      with:
+        from-git: true
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        path: ./radare2-extras
+    - name: Init r2pm
+      run: r2pm -U
+    - name: Compile and install plugins
+      run: |
+        set -e
+        for p in $EXTERNAL_BUILDS ; do
+          echo $p
+          r2pm -i $p
+        done
+        R2PM_GITDIR="$(r2pm -H R2PM_GITDIR)"
+        for p in $LOCAL_BUILDS ; do
+          echo $p
+          ln -s "$GITHUB_WORKSPACE/radare2-extras" "$R2PM_GITDIR/$p"
+          R2PM_OFFLINE=1 r2pm -i $p
+        done
+        make -C radare2-extras/mn103 install
+    - name: Test plugins
+      working-directory: radare2/test
+      run: |
+        make keystone
+        r2r -u "$GITHUB_WORKSPACE/radare2-extras/test/db/extras"

.github/workflows/codeql.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: "30 16 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript, python ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.gitignore

@@ -16,4 +16,11 @@
 *.swp
 *.swo
 *.un~
+/Makefile
+r2yara/Makefile
+/options.mk
 
+# misc
+tags
+
+node_modules

.travis.yml

@@ -1,86 +0,0 @@
-os:
-  - linux
-compiler:
-  - clang
-
-addons:
-  apt:
-    packages:
-      - g++
-      - llvm-dev
-      - libatomic-ops-dev
-
-env:
-  - TESTS="r2pm -i armthumb"
-  - TESTS="r2pm -i baleful"
-  - TESTS="r2pm -i bcl"
-  - TESTS="r2pm -i blackfin"
-  - TESTS="r2pm -i blessr2"
-  - TESTS="r2pm -i bokken"
-  - TESTS="r2pm -i bpf"
-  - TESTS="r2pm -i dlang"
-  - TESTS="r2pm -i duktape"
-  - TESTS="r2pm -i io-ewf"
-  - TESTS="r2pm -i keystone-lib && r2pm -i keystone && cd radare2-regressions && make keystone && cd .."
-  - TESTS="r2pm -i mdmp"
-  - TESTS="r2pm -i microblaze"
-  - TESTS="r2pm -i msil"
-  - TESTS="r2pm -i ppcdisasm"
-  - TESTS="r2pm -i psosvm"
-  - TESTS="r2pm -i pyc"
-  - TESTS="r2pm -i python"
-  - TESTS="r2pm -i r2pipe-cs"
-  - TESTS="r2pm -i r2pipe-go"
-  - TESTS="r2pm -i r2pipe-js"
-  - TESTS="r2pm -i r2pipe-py"
-  - TESTS="r2pm -i r2pipe-rb"
-  - TESTS="r2pm -i r2pipe-vala"
-  - TESTS="r2pm -i radare2"
-  - TESTS="r2pm -i radeco"
-  - TESTS="r2pm -i retdec"
-  - TESTS="r2pm -i swf && cd radare2-regressions && make swf && cd .."
-  - TESTS="r2pm -i swig"
-  - TESTS="r2pm -i syms2elf"
-  - TESTS="r2pm -i tcc"
-  - TESTS="r2pm -i unicorn"
-  - TESTS="r2pm -i unicorn-lib"
-  - TESTS="r2pm -i vala"
-  - TESTS="r2pm -i valabind"
-  - TESTS="r2pm -i vapi"
-  - TESTS="r2pm -i vc4"
-  - TESTS="r2pm -i winapi"
-  - TESTS="r2pm -i www-enyo"
-  - TESTS="r2pm -i www-m"
-  - TESTS="r2pm -i www-p"
-  - TESTS="r2pm -i www-t"
-  - TESTS="r2pm -i x86bea"
-  - TESTS="r2pm -i yara2"
-  - TESTS="r2pm -i yara2-lib"
-  - TESTS="r2pm -i yara3"
-  - TESTS="r2pm -i yara3-lib"
-sudo:
-  - false
-language:
-  - c
-cache:
-  - ccache
-  - apt
-
-before_script:
-  - git clone https://github.com/radare/radare2-regressions
-  - git clone https://github.com/radare/radare2 && cd radare2
-  - ./configure --prefix=`pwd`/install > /dev/null
-  - make -s -j2 > /dev/null
-  - make install > /dev/null
-  - export PATH=${TRAVIS_BUILD_DIR}/radare2/install/bin:${PATH}
-  - export LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/radare2/install/lib:${LD_LIBRARY_PATH}
-  - export LIBR_INCLUDE=${TRAVIS_BUILD_DIR}/radare2/libr/include
-  - export LIBR_UTIL=${TRAVIS_BUILD_DIR}/radare2/libr/util
-  - export PKG_CONFIG_PATH=${TRAVIS_BUILD_DIR}/radare2/pkgcfg
-  - cd ..
-
-script:
-  - ./configure --prefix=`pwd`/radare2/install
-  - r2pm init
-  - eval $TESTS
-

Makefile.acr

@@ -1,64 +1,71 @@
-VERSION=@VERSION@
-HAVE_LIB_YARA=@HAVE_LIB_YARA@
-PREFIX=@PREFIX@
+include options.mk
+
 DESTDIR?=
 TAR=tar -cvf
 CZ=xz -f
 
 DIRS=
 ifeq ($(HAVE_LIB_YARA),1)
-DIRS+=yara/yara2
-DIRS+=yara/yara3
+DIRS+=yara/yara
 DIRS+=libr/asm/p
 DIRS+=libr/anal/p
 endif
 
 help:
-	@echo "Usage make [target]   .. Targets:"
+	@echo "Usage make [target] .. Targets:"
 	@echo "  all                - build everything"
 	@echo "  baleful            - build baleful r2 plugin"
+	@echo "  afen               - build afen r2 plugin"
 	@echo "  asm                - build armthumb, ppc, psosvm, x86bea, m68k plugins"
+	@echo "  io                 - build io plugins"
 	@echo "  anal               - build analysis plugins (RAnal)"
+	@echo "  bin                - build binary plugins (RBin)"
 	@echo "  debug              - build debugger plugins (RDebug)"
-	@echo "  dlang              - support DLang demangler (RBin)"
-	@echo "  yara{2,3}          - build yara2 or yara3 r2 plugin"
+	@echo "  yara               - build yara3 r2 plugin"
 	@echo "  (target)-install   - install given plugin"
 	@echo "  (target)-clean     - clean given plugin"
-	@echo "  install-yara{2,3}  - install Yara 2 or 3 from Git"
 
+#	@echo "  install-yara{2,3}  - install Yara 2 or 3 from Git"
+
+afen:
+	$(MAKE) -C afen
 baleful:
 	$(MAKE) -C baleful
 debug unicorn:
 	$(MAKE) -C libr/debug/p
 anal:
 	$(MAKE) -C libr/anal/p
+anal-install:
+	$(MAKE) -C libr/anal/p install DESTDIR=$(DESTDIR)
 asm:
 	$(MAKE) -C libr/asm/p
 asm-install:
 	$(MAKE) -C libr/asm/p install DESTDIR=$(DESTDIR)
 asm-clean:
 	$(MAKE) -C libr/asm/p clean
-dlang:
+bin:
 	$(MAKE) -C libr/bin/p
-dlang-install:
+bin-install:
 	$(MAKE) -C libr/bin/p install DESTDIR=$(DESTDIR)
-yara2 yara3:
+io:
+	$(MAKE) -C libr/io/p
+io-install:
+	$(MAKE) -C libr/io/p install DESTDIR=$(DESTDIR)
+yara:
 	cd yara/$@ ; ./configure --prefix=$(PREFIX)
 	$(MAKE) -C yara/$@
-yara2-clean:
-	$(MAKE) -C yara/yara2 clean
-yara3-clean:
-	$(MAKE) -C yara/yara3 clean
+yara-clean:
+	$(MAKE) -C yara/yara clean
+afen-install:
+	$(MAKE) -C afen install DESTDIR=$(DESTDIR)
 baleful-install:
 	$(MAKE) -C baleful install DESTDIR=$(DESTDIR)
 debug-install unicorn-install:
 	$(MAKE) -C libr/debug/p install DESTDIR=$(DESTDIR)
 debug-uninstall unicorn-uninstall:
 	$(MAKE) -C libr/debug/p uninstall DESTDIR=$(DESTDIR)
-yara2-install:
-	$(MAKE) -C yara/yara2 install DESTDIR=$(DESTDIR)
 yara3-install:
-	$(MAKE) -C yara/yara3 install DESTDIR=$(DESTDIR)
+	$(MAKE) -C yara/yara install DESTDIR=$(DESTDIR)
 
 all:
 	for a in $(DIRS) ; do \

README.md

@@ -1,5 +1,8 @@
-radare2-extras
-==============
+# radare2-extras
+
+[![GithubCI Status](https://github.com/radareorg/radare2-extras/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/radareorg/radare2-extras/actions?query=workflow%3A%22ci%22)
+[![radare2](https://img.shields.io/badge/radare2-6.0.4-green)](https://github.com/radareorg/radare2)
+
 This repository contains extra plugins for radare2.
 
 The reasons why those plugins are distributed in a separate
@@ -12,13 +15,6 @@ repository are the following:
 * Duplicates functionality from r2 (no need to have
   multiple disassemblers for the same arch in core)
 
-The compiled plugins will be installed at
-
-	/usr/lib/radare2-extras/$(VERSION)
-
-Some of the plugins/code doesnt compiles, it will be reviewed
-and cleaned up, merged into core, updated or removed.
-
 In addition, this repository will be useful to new contributors,
 comers who want to write his own r2 plugins for example.
 
@@ -27,91 +23,16 @@ repository to be as concise as possible, and reduce the
 amount of unnecessary plugins to shrink the install size and
 keep it usable for 99% of users.
 
-Building
-========
-To build radare2-extras, just follow the common gnu-configure steps:
+## Building
 
-	./configure --prefix=/usr
-	make baleful
-	make baleful-install
+The recommended way to build and install those plugins for users
+is to use r2pm. See the [radare2 plugins](https://github.com/radareorg/radare2#plugins) documentation for details.
 
-To install yara3 and the r2 plugin:
+## Notable plugins
 
-	./configure --prefix=/usr
-	make install-yara3
-	make yara3
-	make yara3-install
+* [`msl`](msl/) — Memory Slice (`.msl`) support: open/emulate process memory
+  dumps (`io`/`bin`/`debug` plugins, with ESIL reverse execution) and produce
+  them from a live debug session (`dgm`/`dgma`, `core` plugin).
 
-Note the `symstall` instead of `install` will symlink the plugins
-instead of copying them. This way you can just avoid installing
-every time you build. This installation method is prefered for
-developers.
-
-Each module may have it's own configure script, this way
-packagers can create plugin-specific packages like this:
-
-	radare2-extras-yara -> yara plugin
-
-Directories
-===========
-
-* yara/yara2 yara/yara3
-
-	yara2/3 command. Depends on libyara
-
-* libr/asm/p
-
-	Contains assembler/disassembler plugins:
-
-	* m68k
-	* armthumb
-	* psosvm
-	* ppc
-
-* libr/bin/p
-
-	Bin-related plugins:
-
-	* dlang demangler
-
-* libr/anal/p
-
-	Contains code analysis plugins
-
-* libr/vm
-
-	Contains the initial implementation of ESIL. It is kept
-	for historical reasons, but will be removed soon or late.
-
-* libr/cmd
-
-	very work-in-progress core cmd plugins
-	for historical reasons, but will be removed soon or late.
-
-RFC
-===
-	
-In addition we should add sys/*.sh files to fetch and build the
-plugins and dependencies if needed (yara.sh) to allow git users
-to get the proper version installed without depending on the
-pkgsystem.
-
-We could still provide one-liners to help them. We should keep
-different versioning numbers for each plugin..
-
-	radare2-extras-yara3-0.9.9-0.1
-	[pkgname] [modname] [r2version] [modversion]
-
-* Do we need a radare2-extra-regressions then?
-
-I would just add the tests inside the radare2-extras/libr/core/p/yara/t/
-for example.. and just make those tests run from inside that
-repo, no need to add more repos because those plugins would be
-pretty contained.
-
-* What about checking all the tests right away?
-
-Also maybe the plugins depend on some r2 behavior, that has
-been broken, and we need to test for that jenkins should run
-those tests don't know much about jenkins, so i won't say much.
-just hoping it covers all our bases.
+* [`r2gg`](r2gg/) — Game Gear emulation through Z80 ESIL, with color terminal
+  display, controls, Sega cartridge banking, interrupts, and stereo PSG audio.

afen/Makefile

@@ -0,0 +1,22 @@
+LIBEXT=$(shell r2 -HR2_LIBEXT)
+CFLAGS+=$(shell pkg-config --cflags r_core)
+LDFLAGS+=$(shell pkg-config --libs r_core)
+R2_USER_PLUGINS=$(shell r2 -HR2_USER_PLUGINS)
+
+CORE_AFEN=src/libcoreafen.$(LIBEXT)
+OBJS=src/main.o
+
+all: $(CORE_AFEN)
+
+$(CORE_AFEN): $(OBJS)
+	r2pm -r $(CC) $(LDFLAGS) -shared -fPIC -o $(CORE_AFEN) $(OBJS)
+
+clean:
+	rm -f $(OBJS) $(CORE_AFEN)
+
+user-install install:
+	mkdir -p $(R2_USER_PLUGINS)
+	cp -f $(CORE_AFEN) $(R2_USER_PLUGINS)
+
+user-uninstall uninstall:
+	rm -f $(R2_USER_PLUGINS)/$(CORE_AFEN)

afen/README.md

@@ -0,0 +1,30 @@
+# afen plugin
+
+Author: satk0
+
+NOTE: Making this plugin would not be possible without the help from pancake. Big thanks to him!
+
+Radare2 plugin to rename expressions
+
+This plugin should register a new `afen` command that should rename any expression
+to any text, thus enabling a creation of variables from expressions.
+
+## Building and installing the plugin:
+
+Build:
+
+    r2pm -r meson setup build
+
+Install:
+
+    meson install -C build
+
+## Run:
+
+    r2 -e asm.parser=afen -e asm.pseudo=true <file>
+
+## Usage:
+
+For instance, to rename `rbp + rax - 0x1020` expression to `cwd[i]`, you could use the following command:
+
+    afen cmd[i] "rbp + rax - 0x1020"

afen/meson.build

@@ -0,0 +1,12 @@
+project('r2-afen', 'c', license : 'MIT', meson_version : '>=1.00', version : '0.1.0')
+
+r2_plugdir = run_command('r2', '-H', 'R2_USER_PLUGINS', check: true).stdout().strip()
+
+sources = [ 'src/main.c' ]
+lib = library('coreafen', sources,
+	dependencies : [
+		dependency('r_core')
+	],
+	install_dir: r2_plugdir,
+	install: true
+)

afen/src/main.c

@@ -0,0 +1,269 @@
+/* radare - Copyright 2024 - satk0 */
+
+#define R_LOG_ORIGIN "core.afen"
+
+#include <r_core.h>
+
+typedef struct RAfenRepl {
+	char *old_name;
+	char *new_name;
+} RAfenRepl;
+
+#if R2_VERSION_NUMBER >= 50909
+#else
+static R_TH_LOCAL HtUP *ht; // hash table
+#endif
+
+#if R2_VERSION_NUMBER >= 50909
+static void fini(RAsmPluginSession *aps) {
+	RParse *p = aps->rasm->parse;
+	R_FREE (p->retleave_asm);
+}
+#endif
+
+static char *parse(RCore *core, const char *data, HtUP *ht) {
+	char *out = strdup (data);
+#if R2_VERSION_NUMBER >= 50909
+	RAnalFunction *fcn = r_anal_get_function_at (core->anal, core->addr);
+#else
+	RAnalFunction *fcn = r_anal_get_function_at (core->anal, core->offset);
+#endif
+	if (fcn) {
+		RVector *vec = ht_up_find (ht, fcn->addr, NULL);
+		if (vec) {
+			RAfenRepl *repl;
+			r_vector_foreach (vec, repl) {
+				out = r_str_replace_all (out, repl->old_name, repl->new_name);
+			}
+		}
+	}
+	return out;
+}
+// afen parser
+#if R2_VERSION_NUMBER >= 50909
+static char *r_parse_afen(RAsmPluginSession *aps, const char *data) {
+	char* out = parse ((RCore *) aps->rasm->user, data, aps->data);
+	return out;
+}
+#else
+static int r_parse_afen(RParse *p, const char *data, char *str) {
+	char* out = parse ((RCore *) p->analb.anal->user, data, ht);
+
+	strcpy (str, out);
+	return true;
+}
+#endif
+
+// RParse plugin Definition Info
+#if R2_VERSION_NUMBER >= 50909
+RAsmPlugin r_parse_plugin_afen = {
+	.meta = {
+		.name = "afen",
+		.desc = "Afen parse plugin",
+	},
+	.parse = r_parse_afen,
+	.fini = fini,
+	// .subvar = subvar,
+};
+#else
+RParsePlugin r_parse_plugin_afen = {
+	.name = "afen",
+	.desc = "Afen parse plugin",
+	.parse = r_parse_afen,
+};
+#endif
+
+static inline void repl_free_afen(void *e, void *user ) {
+	RAfenRepl *repl = (RAfenRepl *) e;
+	if (repl) {
+		R_FREE (repl->old_name);
+		R_FREE (repl->new_name);
+	}
+}
+
+static inline void vector_value_free_afen(HtUPKv *kv) {
+	RVector *vec = (RVector *) kv->value;
+	if (vec) {
+		r_vector_free (vec);
+	}
+}
+
+static bool print_afen_rules(void *user, const ut64 key, const void *value) {
+	RCore *core = (RCore *) user;
+	RVector *vec = (RVector *) value;
+	RAfenRepl *repl;
+
+	r_vector_foreach (vec, repl) {
+		r_cons_printf (core->cons, "'@0x%08"PFMT64x"'afen \"%s\" \"%s\"\n", key, repl->new_name, repl->old_name);
+	}
+	return true;
+}
+
+// setup afen parser
+#if R2_VERSION_NUMBER >= 50909
+static bool r_core_init_afen(RCorePluginSession *cps) {
+	RCore *core = (RCore *) cps->core;
+
+	r_asm_plugin_add (core->rasm, &r_parse_plugin_afen);
+
+	RAsmPluginSession *afen_aps = NULL;
+
+	RListIter *iter;
+	RAsmPluginSession *aps;
+	r_list_foreach (core->rasm->sessions, iter, aps) {
+		if (aps && aps->plugin && aps->plugin->meta.name &&
+				!strcmp(aps->plugin->meta.name, "afen")) {
+			afen_aps = aps;
+			break;
+		}
+	}
+	if (!afen_aps) {
+		R_LOG_ERROR ("Failed to find afen plugin session");
+		return false;
+	}
+
+	HtUP /*<ut64, RVector<RAfenRepl*>>*/ *ht = ht_up_new (NULL, vector_value_free_afen, NULL);
+	if (!ht) {
+		R_LOG_ERROR ("Fail to initialize hashtable");
+		ht_up_free (ht);
+		return false;
+	}
+	afen_aps->data = ht;
+	cps->data = ht;
+
+	return true;
+}
+#else
+static bool r_core_init_afen(void *user, const char *input) {
+	RCmd *rcmd = (RCmd *) user;
+	RCore *core = (RCore *) rcmd->data;
+
+	r_parse_plugin_add (core->parser, &r_parse_plugin_afen);
+
+	/*<ut64, RVector<RAfenRepl*>>*/ ht = ht_up_new (NULL, vector_value_free_afen, NULL);
+	if (!ht) {
+		R_LOG_ERROR ("Fail to initialize hashtable");
+		ht_up_free (ht);
+		return false;
+	}
+
+	return true;
+}
+#endif
+
+#if R2_VERSION_NUMBER >= 50909
+static bool r_core_fini_afen(RCorePluginSession *cps) {
+	HtUP *ht = cps->data;
+	ht_up_free (ht);
+	ht = NULL;
+
+	return true;
+}
+#else
+static bool r_core_fini_afen(void *user, const char *input) {
+	ht_up_free (ht);
+	ht = NULL;
+
+	return true;
+}
+#endif
+
+static bool check_for_afen_command(RCore *core, const char *input, HtUP *ht) {
+	if (r_str_startswith (input, "afen*")) {
+		ht_up_foreach(ht, print_afen_rules, core);
+		return true;
+	} else if (r_str_startswith (input, "afen")) {
+		int argc = 0;
+		char **argv = r_str_argv (input, &argc);
+		if (!argv || argc != 3) {
+			R_LOG_INFO ("Usage: afen new_name old_name");
+			r_str_argv_free (argv);
+			return true;
+		}
+#if R2_VERSION_NUMBER >= 50909
+		RAnalFunction *fcn = r_anal_get_function_at (core->anal, core->addr);
+#else
+		RAnalFunction *fcn = r_anal_get_function_at (core->anal, core->offset);
+#endif
+		if (!fcn) {
+#if R2_VERSION_NUMBER >= 50909
+			R_LOG_ERROR ("No Function at 0x%08" PFMT64x, core->addr);
+#else
+			R_LOG_ERROR ("No Function at 0x%08" PFMT64x, core->offset);
+#endif
+			R_LOG_INFO ("Use afen inside a function!");
+			r_str_argv_free (argv);
+			return false;
+		}
+
+		RVector *vec = ht_up_find (ht, fcn->addr, NULL);
+
+		if (!vec) {
+			vec = r_vector_new (sizeof (RAfenRepl), repl_free_afen, NULL);
+			ht_up_insert (ht, fcn->addr, vec);
+		}
+
+		bool updated = false;
+		RAfenRepl *repl;
+		r_vector_foreach (vec, repl) {
+			if (repl->old_name && argv[2] && !strcmp (repl->old_name, argv[2])) {
+				if (repl->new_name) {
+					R_FREE (repl->new_name);
+				}
+				repl->new_name = strdup (argv[1]);
+				updated = true;
+				break;
+			}
+		}
+
+		if (updated) {
+			r_str_argv_free (argv);
+			return true;
+		}
+
+		repl = R_NEW0 (RAfenRepl);
+		repl->new_name = strdup (argv[1]);
+		repl->old_name = strdup (argv[2]);
+
+		r_vector_push (vec, repl);
+
+		r_str_argv_free (argv);
+		return true;
+	}
+	return false;
+}
+
+#if R2_VERSION_NUMBER >= 50909
+static bool r_core_call_afen(RCorePluginSession *cps, const char *input) {
+	return check_for_afen_command(cps->core, input, cps->data);
+}
+#else
+static bool r_core_call_afen(void *user, const char *input) {
+	return check_for_afen_command((RCore *) user, input, ht);
+}
+#endif
+
+// RCore plugin Definition Info
+RCorePlugin r_core_plugin_afen = {
+	.meta = {
+		.name = "core-afen",
+		.desc = "Rename expressions",
+		.author = "satk0",
+		.license = "GPLv3",
+	},
+	.call = r_core_call_afen,
+	.init = r_core_init_afen,
+	.fini = r_core_fini_afen
+};
+
+
+#ifndef R2_PLUGIN_INCORE
+R_API RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_CORE,
+	.data = &r_core_plugin_afen,
+	.version = R2_VERSION,
+#if R2_VERSION_NUMBER >= 50909
+	.abiversion = R2_ABIVERSION,
+#endif
+};
+#endif

agc/Makefile

@@ -0,0 +1,31 @@
+include ../options.mk
+
+CFLAGS+=$(R2_CFLAGS) -Wall -shared -fPIC $(LDFLAGS_LIB) -DLIL_ENDIAN=1
+LDLAGS+=$(R2_LDFLAGS)
+
+LDFLAGS+=$(LINK) -lr_util
+DESTDIR?=
+
+CURDIR=
+
+TARGET_ASM=asm_agc.$(LIBEXT)
+TARGET_ANAL=anal_agc.$(LIBEXT)
+
+OBJ_ASM=asm.o asm_main.o
+
+OBJ_ANAL=asm.o anal.o anal_main.o
+
+ALL_TARGETS= $(TARGET_ASM) $(TARGET_ANAL)
+
+all: $(ALL_TARGETS)
+
+$(TARGET_ASM): $(OBJ_ASM)
+	$(CC) $(call libname,asm_agc) $(LDFLAGS) \
+		$(CFLAGS) -o $(TARGET_ASM) $(OBJ_ASM)
+
+$(TARGET_ANAL): $(OBJ_ANAL)
+	$(CC) $(call libname,anal_agc) $(LDFLAGS) \
+		$(CFLAGS) -o $(TARGET_ANAL) $(OBJ_ANAL)
+
+clean:
+	rm -f *.{o,so}

agc/anal.c

@@ -0,0 +1,255 @@
+/* radare2 - BSD - Copyright 2016 - ibabushkin */
+
+#include <stdio.h>
+#include <r_anal.h>
+#include "anal.h"
+#include "asm.h"
+
+static ut64 get_type(agc_insn_type type) {
+	switch (type) {
+	// arithmetic instructions
+	case AGC_INSN_DDOUBL: // double `A`, `L` register pair
+	case AGC_INSN_DOUBLE: // double `A` register
+	case AGC_INSN_INDEX: // add value to next instruction
+	case AGC_INSN_DAS: // add `A`, `L` register pair to memory
+	case AGC_INSN_INCR: // increment
+	case AGC_INSN_ADS: // add `A` register to memory
+	case AGC_INSN_AD: // add memory to the `A` register
+	case AGC_INSN_AUG: // "augment" a value
+	case AGC_INSN_DIM: // "diminish" a value
+		return R_ANAL_OP_TYPE_ADD;
+	case AGC_INSN_MSU: // special kind of difference
+	case AGC_INSN_SU: // subtract memory from `A` register
+		return R_ANAL_OP_TYPE_SUB;
+	case AGC_INSN_SQUARE: // square the `A` register
+	case AGC_INSN_MP: // multiply with `A` register
+		return R_ANAL_OP_TYPE_MUL;
+	case AGC_INSN_DV: // divide `A`, `L` by memory location, write back
+					  // results (quotient and remainder)
+		return R_ANAL_OP_TYPE_DIV;
+	// bitwise logic
+	case AGC_INSN_COM: // complement `A` register
+	case AGC_INSN_CS: // move complement into `A` register
+	case AGC_INSN_DCOM: // complement `A`, `L` register pair
+	case AGC_INSN_DCS: // move complement into `A`, `L` register pair
+		return R_ANAL_OP_TYPE_CPL;
+	case AGC_INSN_MASK: // logically and a value in memory
+		return R_ANAL_OP_TYPE_AND;
+	// control flow and interrupts
+	case AGC_INSN_TCF: // jump to fixed memory
+		return R_ANAL_OP_TYPE_JMP;
+	case AGC_INSN_OVSK: // skip next instruction on overflow
+	case AGC_INSN_CCS: // conditional jump to erasable memory
+	case AGC_INSN_BZF: // branch to fixed memory if `A` = 0
+	case AGC_INSN_BZMF: // branch to fixed memory if `A` <= 0
+		return R_ANAL_OP_TYPE_CJMP;
+	case AGC_INSN_TCAA: // jump to address in `A`
+	case AGC_INSN_XLQ: // jump to `A`
+	case AGC_INSN_XXALQ: // jump to `A` with extracode
+		return R_ANAL_OP_TYPE_UCJMP;
+	case AGC_INSN_TC: // call subroutine
+		return R_ANAL_OP_TYPE_CALL;
+	case AGC_INSN_RETURN: // return from subroutine
+		return R_ANAL_OP_TYPE_RET;
+	case AGC_INSN_INHINT: // diable interrupts
+	case AGC_INSN_RELINT: // enable interrupts
+	case AGC_INSN_RESUME: // resume after an ISR
+	case AGC_INSN_EXTEND: // extend next instruction
+						  // (not directly interrupt-related)
+		return R_ANAL_OP_TYPE_SWI;
+	// moving memory
+	case AGC_INSN_TS: // transfer to storage and manipulate `A`
+		return R_ANAL_OP_TYPE_CMOV; // TODO: maybe make it STORE?
+	case AGC_INSN_CA: // move memory into the `A` register
+	case AGC_INSN_DCA: // move memory into `A`, `L` register pair
+		return R_ANAL_OP_TYPE_LOAD;
+	case AGC_INSN_DTCB: // memory adressing change using a register swap
+	case AGC_INSN_DTCF: // similar to the above
+	case AGC_INSN_ZL: // clear `L` register
+	case AGC_INSN_ZQ: // clear `Q` register
+	case AGC_INSN_LXCH: // exchange with `L` register
+	case AGC_INSN_DXCH: // exchange with `A`, `L` register pair
+	case AGC_INSN_XCH: // exchange with `A` register
+	case AGC_INSN_QXCH: // exchange with `Q` register
+		return R_ANAL_OP_TYPE_XCHG;
+	// special instructions and I/O
+	case AGC_INSN_NOOP: // do nothing
+		return R_ANAL_OP_TYPE_NOP;
+	case AGC_INSN_READ: // read IO channel into `A`
+	case AGC_INSN_WRITE: // write contents of `A` into IO channel
+	case AGC_INSN_RAND: // read IO channel into `A`, with and
+	case AGC_INSN_WAND: // write contents of `A` into IO channel, with and
+	case AGC_INSN_ROR: // read IO channel into `A`, with or
+	case AGC_INSN_WOR: // write contents of `A` into IO channel, with or
+	case AGC_INSN_RXOR: // read IO channel into `A`, with xor
+		return R_ANAL_OP_TYPE_IO;
+	case AGC_INSN_EDRUPT: // we don't know what it does
+	default:
+		return R_ANAL_OP_TYPE_UNK;
+	}
+}
+
+static int set_reg_profile(RAnal *anal) {
+	const char *p = \
+		"=PC	Z\n"
+		"=SP	Q\n"
+		"gpr	A	.16	0	0\n" // TODO: model overflow bit
+		"gpr	L	.16	2	0\n" // TODO: model overflow bit
+		"gpr	Q	.16	4	0\n" // TODO: model overflow bit
+		"seg	EB	.15	6	0\n" // TODO: model mirroring
+		"seg	FB	.15	8	0\n" // TODO: model mirroring
+		"gpr	Z	.12	10	0\n" // ...
+		"seg	BB	.15	12	0\n" // TODO: model mirroring
+		// TODO: model 7th 0-register?
+		"gpr	ARUPT	.15	14	0\n"
+		"gpr	LRUPT	.15	16	0\n"
+		"gpr	QRUPT	.15	18	0\n"
+		"gpr	ZRUPT	.15	20	0\n"
+		"gpr	BBRUPT	.15	22	0\n"
+		"gpr	BRUPT	.15	24	0\n"
+		// TODO: model editing registers
+		// TODO: model timer and counter registers?
+	;
+	return r_reg_set_profile_string (anal->reg, p);
+}
+
+static bool get_esil(RAnalOp *op, const agc_insn_t *insn) {
+	// TODO: account for weird addressing scheme!
+	r_strbuf_init (&op->esil);
+	r_strbuf_set  (&op->esil, "");
+
+	// TODO: implement flag behaviours!
+	switch (insn->type) {
+	case AGC_INSN_COM:
+		r_strbuf_set (&op->esil, "A,!=");
+		break;
+	case AGC_INSN_DDOUBL:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_DOUBLE:
+		r_strbuf_set (&op->esil, "2,A,*=");
+		break;
+	case AGC_INSN_DTCB:
+	case AGC_INSN_DTCF:
+	case AGC_INSN_EXTEND:
+	case AGC_INSN_INHINT:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_NOOP:
+		r_strbuf_set (&op->esil, ",");
+		break;
+	case AGC_INSN_OVSK:
+		r_strbuf_set (&op->esil, "a_overflow,?{,2,Z,+=,}"); // FIXME
+		break;
+	case AGC_INSN_RELINT:
+	case AGC_INSN_RESUME: // TODO: handle extracode
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_RETURN:
+		r_strbuf_set (&op->esil, "Q,Z,=,00003,Q,=");
+		break;
+	case AGC_INSN_TCAA:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_XLQ:
+		r_strbuf_set (&op->esil, "2,$$,+,Q,=,1,Z,=");
+		break;
+	case AGC_INSN_XXALQ:
+		r_strbuf_set (&op->esil, "2,$$,+,Q,=,0,Z,=");
+		break;
+	case AGC_INSN_ZL:
+		r_strbuf_set (&op->esil, "0,L,=");
+		break;
+	case AGC_INSN_TC:
+		r_strbuf_setf (&op->esil, "2,$$,+,Q,=,%04o,Z,=", insn->operand);
+		break;
+	case AGC_INSN_CCS:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_TCF:
+		r_strbuf_setf (&op->esil, "%04o,Z,=", insn->operand);
+		break;
+	case AGC_INSN_DAS:
+	case AGC_INSN_LXCH:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_INCR:
+		r_strbuf_setf (&op->esil,
+				"%04o,[],++,%04o,=[]", insn->operand, insn->operand);
+		break;
+	case AGC_INSN_ADS:
+		r_strbuf_setf (&op->esil,
+				"%04o,[],A,+,A,%04o,[]=", insn->operand, insn->operand);
+		break;
+	case AGC_INSN_CA:
+		r_strbuf_setf (&op->esil, "%04o,[],A,=", insn->operand);
+		break;
+	case AGC_INSN_CS:
+		r_strbuf_setf (&op->esil, "%04o,[],!,A,=", insn->operand);
+		break;
+	case AGC_INSN_INDEX: // TODO: handle extracode
+	case AGC_INSN_DXCH:
+	case AGC_INSN_TS:
+	case AGC_INSN_XCH:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_AD:
+		r_strbuf_setf (&op->esil, "%04o,[],A,+=", insn->operand);
+		break;
+	case AGC_INSN_MASK:
+		r_strbuf_setf (&op->esil, "%04o,[],A,&=", insn->operand);
+		break;
+	case AGC_INSN_DCOM: // TODO: handle extracode flag from here on
+		r_strbuf_set (&op->esil, "A,!=,L,!=");
+		break;
+	case AGC_INSN_SQUARE:
+		r_strbuf_set (&op->esil, "A,A,*=");
+		break;
+	case AGC_INSN_ZQ:
+		r_strbuf_set (&op->esil, "0,A,=");
+	case AGC_INSN_READ:
+	case AGC_INSN_WRITE:
+	case AGC_INSN_RAND:
+	case AGC_INSN_WAND:
+	case AGC_INSN_ROR:
+	case AGC_INSN_WOR:
+	case AGC_INSN_RXOR:
+	case AGC_INSN_EDRUPT:
+	case AGC_INSN_DV:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_BZF:
+		r_strbuf_setf (&op->esil, "0,A,==,?,{,%04o,Z,=,}", insn->operand);
+		break;
+	case AGC_INSN_MSU:
+	case AGC_INSN_QXCH:
+	case AGC_INSN_AUG:
+	case AGC_INSN_DIM:
+	case AGC_INSN_DCA:
+	case AGC_INSN_DCS:
+		// TODO: find a way to implement
+		break;
+	case AGC_INSN_SU:
+		r_strbuf_setf (&op->esil, "%04o,A,-=", insn->operand);
+		break;
+	case AGC_INSN_BZMF:
+		r_strbuf_setf (&op->esil, "0,A,<=,?,{,%04o,Z,=,}", insn->operand);
+		break;
+	case AGC_INSN_MP:
+		r_strbuf_setf (&op->esil, "%04o,A,*=", insn->operand);
+		break;
+
+	default:
+		return false;
+	}
+	return true;
+}
+
+void analyze_agc_insn(RAnalOp *op, ut64 address, ut16 value, bool shift) {
+
+	agc_insn_t insn = {0};
+	disasm_agc_insn (&insn, address, value, shift);
+
+	op->size = 2;
+	op->type = get_type (insn.type);
+}

agc/anal.h

@@ -0,0 +1,11 @@
+#ifndef AGC_ANAL_H
+#define AGC_ANAL_H
+
+#define SWITCH_MASK 070000
+#define LOWER_WIDE 07777
+#define LOWER 01777
+#define HIGHER 06000
+
+void analyze_agc_insn(RAnalOp *op, ut64 address, ut16 value, bool shift);
+
+#endif

agc/anal_main.c

@@ -0,0 +1,33 @@
+/* radare2 - BSD - Copyright 2016 - ibabushkin */
+
+#include <r_types.h>
+#include <r_lib.h>
+#include <r_util.h>
+#include <r_anal.h>
+#include "anal.h"
+
+static int agc_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
+	// early exit on illegal inputs
+	if (!data || len != 2) {
+		return -1;
+	}
+	analyze_agc_insn (op, addr, ((const ut16 *)data)[0], false);
+	return op->size;
+}
+
+RAnalPlugin r_anal_plugin_agc = {
+	.name = "agc",
+	.arch = "agc",
+	.bits = 16,
+	.license = "BSD",
+	.desc = "AGC (Apollo Guidance Computer) code analysis plugin",
+	.op = &agc_op,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ANAL,
+	.data = &r_anal_plugin_agc,
+	.version = R2_VERSION
+};
+#endif

agc/asm.c

@@ -0,0 +1,398 @@
+/*
+  Copyright 2003-2006 Ronald S. Burkey <[email protected]>,
+			2008 Onno Hommes
+			2016 Inokentiy Babushkin
+
+  This file is based on the implmentation found in yaAGC, but modified for new
+  purposes.
+
+  This file is part of yaAGC / radare2-extras.
+  yaAGC 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 2 of the License, or
+  (at your option) any later version.
+  yaAGC 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 yaAGC; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+
+  Filename:  asm_agc.c
+  Purpose:	 Source file for AGC Disassembler integrated in radare2.
+  Contact:	 Inokentiy Babushkin
+  Reference: http://www.ibiblio.org/apollo
+  Mods:		 08/31/08 OH. Began.
+			 07/12/16 IB. Began refactoring to include in radare2-extras.
+			 07/17/16 IB. Annotated disassembler source and added symbolic
+						  constants.
+*/
+
+#include <stdbool.h>
+#include "asm.h"
+
+const char *agc_mnemonics[59] = {
+	// 3-bit opcode, no operand
+	"com", "ddoubl", "double", "dtcb", "dtcf", "extend", "inhint", "noop",
+	"ovsk", "relint", "resume", "return", "tcaa", "xlq", "xxalq", "zl",
+	// 3-bit opcode, w/ operand
+	"tc %04o", "ccs %04o", "tcf %04o", "das %04o", "lxch %04o",
+	"incr %04o", "ads %04o", "ca %04o", "cs %04o", "index %04o",
+	"dxch %04o", "ts %04o", "xch %04o", "ad %04o", "mask %04o",
+	// 4-bit opcode, no operand
+	"dcom", "resume", "square", "zq",
+	// 4-bit opcode, w/ small operand
+	"read %03o", "write %03o", "rand %03o", "wand %03o", "ror %03o",
+	"wor %03o", "rxor %03o", "edrupt %03o",
+	// 4-bit opcode, w/ normal operand
+	"dv %04o", "bzf %04o", "msu %04o", "qxch %04o", "aug %04o",
+	"dim %04o", "dca %04o", "dcs %04o", "index %04o", "su %04o",
+	"bzmf %04o", "mp %04o"
+};
+
+// decode a 3-bit opcode
+static void decode_no_extra_opcode_bit(
+		agc_insn_t *insn, ut16 value, ut16 nop_value) {
+	// first, special cases that have their own mnemonics
+	if (value == 040000) { // i = 100, o = 0
+		// complement the A register (address 0)
+		insn->type = AGC_INSN_COM;
+	} else if (value == 020001) { // i = 010, o = 0, 1
+		// add the A, L register pair to itself (addresses 0 and 1)
+		insn->type = AGC_INSN_DDOUBL;
+	} else if (value == 060000) { // i = 110, o = 0
+		// add the A register to itself (address 0o)
+		insn->type = AGC_INSN_DOUBLE;
+	} else if (value == 052006) {
+		// change adressing, see manual
+		insn->type = AGC_INSN_DTCB;
+	} else if (value == 052005) {
+		// change adressing, see manual
+		insn->type = AGC_INSN_DTCF;
+	} else if (value == 6) {
+		// set extracode flag for next instruction, and the instruction
+		// after that, if it is an index.
+		insn->type = AGC_INSN_EXTEND;
+	} else if (value == 4) {
+		// disable interrupts
+		insn->type = AGC_INSN_INHINT;
+	} else if (value == nop_value && value != 010000) {
+		// do nothing
+		insn->type = AGC_INSN_NOOP;
+	} else if (value == 054000) {
+		// skip the next instruction if A is overflown
+		insn->type = AGC_INSN_OVSK;
+	} else if (value == 3) {
+		// enable interrupts after an inhint
+		insn->type = AGC_INSN_RELINT;
+	} else if (value == 050017) {
+		// resume program from an ISR
+		insn->type = AGC_INSN_RESUME;
+	} else if (value == 2) {
+		// return from subroutine, which is to say, move the Q register
+		// into the Z register.
+		insn->type = AGC_INSN_RETURN;
+	} else if (value == 054005) { // essentially a `TS Z`
+		// jump to the address stored in the A register
+		insn->type = AGC_INSN_TCAA;
+	} else if (value == 1) { // essentially a `TC L`
+		// convoluted control flow primitive from hell, see manual: load an
+		// instruction in the `A` register, and a return instruction into
+		// the `L` register, call `XLQ` and you will execute the contents
+		// of `A` and return.
+		insn->type = AGC_INSN_XLQ;
+	} else if (value == 0) { // essentially `TC A`
+		// similar to the above, but with extracode: load an `EXTEND`
+		// instruction into the `A` register, an extracode instruction into
+		// the `L` register, a return instruction into the `Q` register and
+		// call `XXALQ`. This results in the execution of the given
+		// extracode instruction.
+		insn->type = AGC_INSN_XXALQ;
+	} else if (value == 022007) { // essentially `LXCH 7`
+		// zero the `L` register, by exchanging it's content with the 7th
+		// register, which is hardwired to zero.
+		insn->type = AGC_INSN_ZL;
+	} else {
+		switch (value & SWITCH_MASK) {
+		// from now on, we have instructions with operands, so switch based
+		// on the first three bits.
+		case 000000: // i = 000, o = address of subroutine
+			// call a subroutine (this can't be nested, because it stores
+			// the current contents of the `Z` register in the `Q`
+			// register).
+			insn->type = AGC_INSN_TC;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		case 010000: // i = 001
+			// one of the many space-saving tricks employed
+			if (value & HIGHER) {
+				// jump to a memory location
+				// (12 bit address in fixed memory)
+				insn->type = AGC_INSN_TCF;
+				insn->operand = value & LOWER_WIDE;
+			} else {
+				// weird compare and jump (10 bit address in erasable
+				// memory)
+				insn->type = AGC_INSN_CCS;
+				insn->operand = value & LOWER;
+			}
+			break;
+		case 020000: // i = 010
+			switch (value & HIGHER) { // lower bits...
+			case 00000:
+				// add the `A`, `L` register pair to a memory location
+				insn->type = AGC_INSN_DAS;
+				insn->operand = (value - 1) & LOWER;
+				break;
+			case 02000:
+				// exchange the `L` register and a memory location
+				insn->type = AGC_INSN_LXCH;
+				insn->operand = value & LOWER;
+				break;
+			case 04000:
+				// increment a memory location
+				insn->type = AGC_INSN_INCR;
+				insn->operand = value & LOWER;
+				break;
+			case 06000:
+				// add the `A` register to a memory location
+				insn->type = AGC_INSN_ADS;
+				insn->operand = value & LOWER;
+				break;
+			}
+			break;
+		case 030000: // i = 011
+			// move a memory location's contents into the `A` register
+			insn->type = AGC_INSN_CA;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		case 040000: // i = 100
+			// move a memory location's complement into the `A` register
+			insn->type = AGC_INSN_CS;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		case 050000: // i = 101
+			switch (value & HIGHER) { // lower bits again...
+			case 00000:
+				// adds the contents of a memory location to the next
+				// instruction before it is executed, without altering
+				// memory
+				insn->type = AGC_INSN_INDEX;
+				insn->operand = value & LOWER;
+				break;
+			case 02000:
+				// exchange double precision int with `A`, `L` register
+				// pair
+				insn->type = AGC_INSN_DXCH;
+				insn->operand = (value - 1) & LOWER;
+				break;
+			case 04000:
+				// copy the contents of the `A` register to memory,
+				// with extra magic when overflow occured.
+				insn->type = AGC_INSN_TS;
+				insn->operand = value & LOWER;
+				break;
+			case 06000:
+				// exchange an erasable memory location with the `A`
+				// register
+				insn->type = AGC_INSN_XCH;
+				insn->operand = value & LOWER;
+				break;
+			}
+			break;
+		case 060000: // i = 110
+			// add a memory location to the `A` register
+			insn->type = AGC_INSN_AD;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		case 070000: // i = 111
+			// logical and between the `A` register and a memory location
+			insn->type = AGC_INSN_MASK;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		}
+	}
+}
+
+static void decode_extra_opcode_bit(agc_insn_t *insn, ut16 value) {
+	if (value == 040001) { // basically a `DCS A`
+		// bitwise complement of the register pair `A`, `L`
+		insn->type = AGC_INSN_DCOM;
+	} else if (value == 050017) {
+		// FIXME: wtf is this here? see manual...
+		// resume program from an ISR
+		insn->type = AGC_INSN_RESUME;
+	} else if (value == 070000) { // essentially `MP A`
+		// square the contents of register `A`
+		insn->type = AGC_INSN_SQUARE;
+	} else if (value == 022007) { // essentially `QXCH 7`
+		// zero the `Q` register, by exchanging it's content with the 7th
+		// register, which is hardwired to zero.
+		insn->type = AGC_INSN_ZQ;
+	} else {
+		switch (value & SWITCH_MASK) {
+		case 000000: // i = 000
+			insn->operand = value & 0777;
+			switch (value & 07000) { // lower bits
+			case 00000:
+				// read a 9 bit IO channel into register `A`
+				insn->type = AGC_INSN_READ;
+				break;
+			case 01000:
+				// write register `A` into a 9 bit IO channel
+				insn->type = AGC_INSN_WRITE;
+				break;
+			case 02000:
+				// read and bitwise and
+				insn->type = AGC_INSN_RAND;
+				break;
+			case 03000:
+				// read and bitwise and with writeback
+				insn->type = AGC_INSN_WAND;
+				break;
+			case 04000:
+				// read and bitwise or
+				insn->type = AGC_INSN_ROR;
+				break;
+			case 05000:
+				// read and bitwise or with writeback
+				insn->type = AGC_INSN_WOR;
+				break;
+			case 06000:
+				// read and xor
+				insn->type = AGC_INSN_RXOR;
+				break;
+			case 07000:
+				// noone knows o__O
+				insn->type = AGC_INSN_EDRUPT;
+				break;
+			}
+			break;
+		case 010000: // i = 001
+			if (value & HIGHER) {
+				// branch to a fixed memory location if `A` equals 0
+				insn->type = AGC_INSN_BZF;
+				insn->operand = value & LOWER_WIDE;
+			} else{ 
+				// divide register pair `A`, `L` by a memory location,
+				// putting the quotient/remainder in `A`, `L`, respectively
+				insn->type = AGC_INSN_DV;
+				insn->operand = value & LOWER;
+			}
+			break;
+		case 020000: // i = 010
+			insn->operand = value & LOWER;
+			switch (value & HIGHER) {
+			case 00000:
+				// 1's complement difference between two 2's complement
+				// values of which the first is the register `A`
+				insn->type = AGC_INSN_MSU;
+				break;
+			case 02000:
+				// exchange `Q` register with memory location
+				insn->type = AGC_INSN_QXCH;
+				break;
+			case 04000:
+				// increment positive and decrement negative values at
+				// a memory location, using 1's complement
+				insn->type = AGC_INSN_AUG;
+				break;
+			case 06000:
+				// other way 'round
+				insn->type = AGC_INSN_DIM;
+				break;
+			}
+			break;
+		case 030000: // i = 011
+			// move a pair of registers into `A` and `L`
+			insn->type = AGC_INSN_DCA;
+			insn->operand = (value - 1) & LOWER_WIDE;
+			break;
+		case 040000: // i = 100
+			// move the complement of a pair of registers into `A` and `L`
+			insn->type = AGC_INSN_DCS;
+			insn->operand = (value - 1) & LOWER_WIDE;
+			break;
+		case 050000: // i = 101
+			// see above
+			insn->type = AGC_INSN_INDEX;
+			insn->operand = (value - 1) & LOWER_WIDE;
+			// reset bit
+			break;
+		case 060000: // i = 110
+			if (value & HIGHER) {
+				// branch to a fixed memory location if `A` is equal or
+				// less than 0
+				insn->type = AGC_INSN_BZMF;
+				insn->operand = value & LOWER_WIDE;
+			} else {
+				// subtract a memory location from the `A` register
+				insn->type = AGC_INSN_SU;
+				insn->operand = value & LOWER;
+			}
+			break;
+		case 070000: // i = 111
+			// multiply two single precision values to form a double
+			// precision value, of which one is the accumulator.
+			insn->type = AGC_INSN_MP;
+			insn->operand = value & LOWER_WIDE;
+			break;
+		}
+	}
+}
+
+void disasm_agc_insn(agc_insn_t *insn, unsigned int address, ut16 value, bool shift) {
+	// See http://www.ibiblio.org/apollo/assembly_language_manual.html
+	// for instruction set documentation and other valuable info.
+
+	// extracode flag saved between invocations
+	static bool extra_opcode_bit = false;
+
+	// distinguish between RW and RO memory
+	bool erasable = false;
+	if (address < 02000) {
+		erasable = true;
+	}
+
+	// shift data one bit to the right if we work with memory as it was stored
+	// on the original AGC hardware.
+	if (shift) {
+		value <<= 1;
+	}
+
+	if (extra_opcode_bit) {
+		// the previous instruction was an `EXTEND`. This means we will
+		// interpret not three, but four leading bits of our intruction as an
+		// opcode. This was added to the second-generation AGC, after it became
+		// clear that three bits for an opcode are not enough.
+		extra_opcode_bit = false;
+		decode_extra_opcode_bit (insn, value);
+		if (insn->type == AGC_INSN_EXTEND) {
+			extra_opcode_bit = true;
+		}
+	} else {
+		// simple instructions below - encoded as follows: x iii ooo ooo ooo
+		// where x is the odd-parity bit, which is used only by the hardware
+		// itself to determine error conditions. However, yaYUL doesn't emulate
+		// it, so things are shifted one bit to the left. This behaviour is
+		// configurable, just in case.
+
+		// NOOP's are special:
+		// they are encoded as 10000 + current adress in fixed memory...
+		// (which is a jump to the next instruction)
+		// ...and as a constant value in erasable memory, because the jump
+		// method isn't applicable. Note that this way of encoding it means
+		// loading the accumulator (A) with itself.
+		ut16 nop_value = 010000;
+		if (erasable) {
+			nop_value = 030000;
+		} else if (value == address + 1) {
+			nop_value = value;
+		}
+		decode_no_extra_opcode_bit (insn, value, nop_value);
+		if (insn->type == AGC_INSN_EXTEND) {
+			extra_opcode_bit = true;
+		}
+	}
+}

agc/asm.h

@@ -0,0 +1,87 @@
+#ifndef AGC_ASM_H
+#define AGC_ASM_H
+
+#include <r_types.h>
+
+#define SWITCH_MASK 070000
+#define LOWER_WIDE 07777
+#define LOWER 01777
+#define HIGHER 06000
+
+typedef enum agc_insn_type {
+	AGC_INSN_COM,
+	AGC_INSN_DDOUBL,
+	AGC_INSN_DOUBLE,
+	AGC_INSN_DTCB,
+	AGC_INSN_DTCF,
+	AGC_INSN_EXTEND,
+	AGC_INSN_INHINT,
+	AGC_INSN_NOOP,
+	AGC_INSN_OVSK,
+	AGC_INSN_RELINT,
+	AGC_INSN_RESUME,
+	AGC_INSN_RETURN,
+	AGC_INSN_TCAA,
+	AGC_INSN_XLQ,
+	AGC_INSN_XXALQ,
+	AGC_INSN_ZL,
+	AGC_INSN_TC,
+	AGC_INSN_CCS,
+	AGC_INSN_TCF,
+	AGC_INSN_DAS,
+	AGC_INSN_LXCH,
+	AGC_INSN_INCR,
+	AGC_INSN_ADS,
+	AGC_INSN_CA,
+	AGC_INSN_CS,
+	AGC_INSN_INDEX,
+	AGC_INSN_DXCH,
+	AGC_INSN_TS,
+	AGC_INSN_XCH,
+	AGC_INSN_AD,
+	AGC_INSN_MASK,
+	AGC_INSN_DCOM,
+	// a dirty hack so we can use the enum as indices of our lookup table.
+	// this is due to the fact that the resume instruction is for some reason
+	// present in both the 3-bit-opcode and 4-bit-opcode subsets of the
+	// instruction set.
+	AGC_INSN_RESUME2,
+	AGC_INSN_SQUARE,
+	AGC_INSN_ZQ,
+	AGC_INSN_READ,
+	AGC_INSN_WRITE,
+	AGC_INSN_RAND,
+	AGC_INSN_WAND,
+	AGC_INSN_ROR,
+	AGC_INSN_WOR,
+	AGC_INSN_RXOR,
+	AGC_INSN_EDRUPT,
+	AGC_INSN_DV,
+	AGC_INSN_BZF,
+	AGC_INSN_MSU,
+	AGC_INSN_QXCH,
+	AGC_INSN_AUG,
+	AGC_INSN_DIM,
+	AGC_INSN_DCA,
+	AGC_INSN_DCS,
+	// same hack as above
+	AGC_INSN_INDEX2,
+	AGC_INSN_SU,
+	AGC_INSN_BZMF,
+	AGC_INSN_MP
+} agc_insn_type;
+
+// mnemonic lookup table
+const char *agc_mnemonics[59];
+
+// instruction representation
+typedef struct agc_insn_t {
+	agc_insn_type type;
+	ut16 operand;
+} agc_insn_t;
+
+// actual disassembly logic
+void disasm_agc_insn(
+		agc_insn_t *op, unsigned int address, ut16 value, bool shift);
+
+#endif

agc/asm_main.c

@@ -0,0 +1,44 @@
+/* radare2 - GPL3 - Copyright 2016 - ibabushkin */
+
+#include <stdbool.h>
+#include <r_lib.h>
+#include <r_asm.h>
+#include "asm.h"
+
+static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
+    // default values
+    op->buf_asm[0] = 0;
+    op->size = 2;
+
+    agc_insn_t insn = {0};
+    disasm_agc_insn (&insn, a->pc, ((const ut16 *)buf)[0], false);
+
+    // we sometimes pass more arguments than the format string takes, but who
+    // cares?
+    snprintf (op->buf_asm, R_ASM_BUFSIZE, agc_mnemonics[insn.type], insn.operand);
+
+    return op->size;
+}
+
+static int assemble(RAsm *a, RAsmOp *op, const char *buf) {
+	// TODO
+	return 0;
+}
+
+RAsmPlugin r_asm_plugin_agc = {
+	.name = "agc",
+	.arch = "agc",
+	.bits = 16,
+	.license = "GPL3",
+	.desc = "AGC (Apollo Guidance Computer) disassembly plugin",
+	.disassemble = &disassemble,
+	.assemble = &assemble
+};
+
+#ifndef CORELIB
+struct r_lib_struct_t radare_plugin = {
+	.type = R_LIB_TYPE_ASM,
+	.data = &r_asm_plugin_agc,
+	.version = R2_VERSION
+};
+#endif

agc/d/Makefile

@@ -0,0 +1,33 @@
+# TODO: fix makefile to work with radare2-extras
+FILES=agc
+F_SDB=$(addsuffix .sdb,${FILES})
+SDB=../../../shlr/sdb/sdb
+include ../../../config-user.mk
+
+all: ${F_SDB}
+
+%.sdb:%
+	${SDB} $<.sdb = < $<
+	test -f $<.sdb
+
+clean:
+	rm -f *.sdb
+
+.PHONY: all clean install install-symlink symstall uninstall
+
+# XXX rmdblslash not defined, but doesnt warns about it
+OPDIR=${DESTDIR}${LIBDIR}/radare2/${VERSION}/opcodes
+
+install: ${F_SDB}
+	-rm -rf "${OPDIR}"
+	mkdir -p "${OPDIR}"
+	cp -f *.sdb "${OPDIR}"
+
+#that sed is a workaround for mingw's pwd
+CWD=$(shell pwd)
+symstall install-symlink: ${F_SDB}
+	mkdir -p "${OPDIR}"
+	for FILE in *.sdb ; do ln -fs "${CWD}/$$FILE" "${OPDIR}/$$FILE" ; done
+
+uninstall:
+	rm -rf "${DESTDIR}${LIBDIR}/radare2/opcodes"

agc/d/agc

@@ -0,0 +1,54 @@
+com=complement the `A` register (address 0)
+ddoubl=add the A, `L` register pair to itself (addresses 0 and 1)
+double=add the `A` register to itself (address 0o)
+dtcb=change adressing, see manual
+dtcf=change adressing, see manual
+extend=set extracode flag for next instruction, and the instruction after that, if it is an index.
+inhint=disable interrupts
+noop=no operation, but note that this is encoded in a context-sensitive fashion
+ovsk=skip the next instruction if `A` is overflown
+relint=enable interrupts after an inhint
+resume=resume program from an ISR
+return=return from subroutine, which is to say, move the `Q` register into the `Z` register
+tcaa=jump to the address stored in the `A` register
+xlq=execute the content of the `A` register, assuming there is a `return` instruction in `L`
+xxalq=execute the content of the `L` register as an extracode instruction, assuming there is an `extend` instruction in the `A` register and a `return` instruction in `Q`
+zl=zero the `L` register
+tc=call a subroutine, can't be nested
+ccs=weird compare and jump (10 bit address in erasable memory)
+tcf=jump to a memory location (12 bit address in fixed memory)
+das=add the `A`, `L` register pair to a memory location
+lxch=exchange the `L` register and a memory location
+incr=increment a memory location
+ads=add the `A` register to a memory location
+ca=move a memory location's contents into the `A` register
+cs=move a memory location's complement into the `A` register
+index=add a memory location to the next instruction before it is executed, without altering memory
+dxch=exchange double precision int with `A`, `L` register pair
+ts=copy the contents of the `A` register to memory, with extra magic when overflow occured.
+xch=exchange an erasable memory location with the `A` register
+ad=add a memory location to the `A` register
+mask=logical and between the `A` register and a memory location
+dcom=bitwise complement of the register pair `A`, `L`
+resume=resume program from an ISR
+square=square the contents of register `A`
+zq=zero the `Q` register
+read=read a 9 bit IO channel into register `A`
+write=write register `A` into a 9 bit IO channel
+rand=read and bitwise and
+wand=read and bitwise and with writeback
+ror=read and bitwise or
+wor=read and bitwise or with writeback
+rxor=read and xor
+edrupt=noone knows o__O
+dv=divide register pair `A`, `L` by a memory location (double precision), putting the quotient/remainder in `A`, `L`, respectively
+bzf=branch to a fixed memory location if `A` equals 0
+msu=1's complement difference between two 2's complement values, of which the first is the register `A`
+qxch=exchange `Q` register with memory location
+aug=increment positive and decrement negative values at a memory location, using 1's complement
+dim=other way 'round compared to `aug`
+dca=move a pair of registers into `A` and `L`
+dcs=move the complement of a pair of registers into `A` and `L`
+su=subtract a memory location from the `A` register
+bzmf=branch to a fixed memory location if `A` is equal or less than 0
+mp=multiply two single precision values to form a double precision value, of which one is the accumulator.

asahi/Makefile

@@ -0,0 +1,22 @@
+R2_LIBEXT=$(shell r2 -H R2_LIBEXT)
+R2_USER_PLUGINS=$(shell r2 -H R2_USER_PLUGINS)
+
+CFLAGS+=$(shell pkg-config --cflags r_core)
+LDFLAGS+=$(shell pkg-config --libs r_core)
+CFLAGS+=-Igpu/wrap
+
+all: gpu
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fPIC arch_asahi.c -o arch_asahi.$(R2_LIBEXT)
+
+mrproper clean:
+	rm -f *.$(R2_LIBEXT)
+
+gpu:
+	git clone https://github.com/AsahiLinux/gpu
+
+install:
+	mkdir -p "$(R2_USER_PLUGINS)"
+	cp -f arch_asahi.$(R2_LIBEXT) $(R2_USER_PLUGINS)
+
+uninstall:
+	rm -f $(R2_USER_PLUGINS)/arch_asahi.$(R2_LIBEXT)

asahi/README.md

@@ -0,0 +1,14 @@
+ASAHI
+=====
+
+This is the r2 disassembler plugin for
+the ASAHI GPU shipped in the Apple M1.
+
+This plugin is just a shim on top of [AsahiLinux](https://github.com/AsahiLinux/gpu)
+
+Installation
+------------
+
+* Install r2 from git and then type `make; make install`
+
+Alternatively you can just `r2pm -ci asahi`

asahi/arch_asahi.c

@@ -0,0 +1,40 @@
+/* radare2 - GPL3 - Copyright 2021-2023 - pancake */
+
+#include <r_lib.h>
+#include <r_arch.h>
+#include "gpu/disasm/disasm.c"
+
+static bool decode(RArchSession *as, RAnalOp *op, RAnalOpMask mask) {
+	char out[128];
+	FILE *fp = fmemopen (out, sizeof (out), "w");
+	*out = 0;
+	bool stop = false;
+	int res = agx_disassemble_instr ((uint8_t*)op->bytes, &stop, false, fp);
+	fclose (fp);
+	r_str_replace_char (out, '\n', ' ');
+	free (op->mnemonic);
+	op->mnemonic = r_str_trim_dup (out);
+	op->size = res;
+
+	return op->size;
+}
+
+static RArchPlugin r_arch_plugin_asahi = {
+	.meta = {
+		.name = "asahi",
+		.license = "MIT",
+		.desc = "Asahi: Apple's M1 GPU",
+	},
+	.arch = "asahi",
+	.bits = 32,
+	.decode = &decode,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_asahi,
+	.version = R2_VERSION
+};
+#endif
+

autogen.sh

@@ -5,10 +5,39 @@
 #  git clone https://github.com/radare/acr
 #
 # -- pancake
+#!/bin/sh
+#
+# Look for the 'acr' tool here: https://github.com/radare/acr
+# Clone last version of ACR from here:
+#  git clone https://github.com/radare/acr
+#
+# -- pancake
+
+r2pm -h >/dev/null 2>&1
+if [ $? = 0 ]; then
+	echo "Installing the last version of 'acr'..."
+	r2pm -i acr > /dev/null
+	r2pm -r acr -h > /dev/null 2>&1
+	if [ $? = 0 ]; then
+		echo "Running 'acr -p'..."
+		r2pm -r acr -p
+	else
+		echo "Cannot find 'acr' in PATH"
+	fi
+else
+	echo "Running acr..."
+	acr -p
+fi
+V=`./configure -qV | cut -d - -f -1`
+if [ -n "$1" ]; then
+	echo "./configure $*"
+	./configure $*
+fi
+
 files=`find . -name configure.acr`
 for a in ${files}; do
 	echo "[+] $a"
-	( cd `dirname $a` ; acr -p )
+	( cd `dirname $a` ; r2pm -r acr -p )
 done
 if [ -n "$1" ]; then
 	echo "./configure $@"

baleful/Makefile

@@ -6,13 +6,16 @@ R2_LDFLAGS+=-shared
 all: asm/asm_baleful.$(LIBEXT) anal/anal_baleful.$(LIBEXT)
 
 asm/asm_baleful.$(LIBEXT):
-	$(CC) $(R2_CFLAGS) $(R2_LDFLAGS) -o asm/asm_baleful.$(LIBEXT) asm/asm_baleful.c
+	$(CC) $(CFLAGS) $(LDFLAGS) $(R2_CFLAGS) $(R2_LDFLAGS) -o asm/asm_baleful.$(LIBEXT) asm/asm_baleful.c
 
 anal/anal_baleful.$(LIBEXT):
-	$(CC) $(R2_CFLAGS) $(R2_LDFLAGS) -o anal/anal_baleful.$(LIBEXT) anal/anal_baleful.c
+	$(CC) $(CFLAGS) $(LDFLAGS) $(R2_CFLAGS) $(R2_LDFLAGS) -o anal/anal_baleful.$(LIBEXT) anal/anal_baleful.c
+
+w32:
+	$(MAKE) CC=i586-mingw32-gcc LDFLAGS=-L/tmp/radare2-w32-0.10.5 LIBEXT=dll
 
 clean:
-	rm -f */*.$(LIBEXT)
+	rm -f */*.$(LIBEXT) */*.dll */*.so */*.dylib
 
 install:
 	cp -f asm/asm_baleful.$(LIBEXT) anal/anal_baleful.$(LIBEXT) $(R2PM_PLUGDIR)

baleful/anal/anal_baleful.c

@@ -1,31 +1,36 @@
-/* radare2 - LGPL - Copyright 2011-2014 - pancake */
+/* radare2 - LGPL - Copyright 2011-2016 - SkUaTeR */
 
 #include <string.h>
 #include <r_types.h>
 #include <r_lib.h>
 #include <r_asm.h>
+// #include <r_arch.h>
 #include <r_anal.h>
 #include <stdio.h>
 #include <fcntl.h>
-static int ptsHandle=0;
 
-int reg_read(RAnalEsil *esil, const char *regname, ut64 *num) {
+static int ptsHandle = 0;
+
+static bool reg_read(RAnalEsil *esil, const char *regname, ut64 *num) {
 	RRegItem *reg = r_reg_get (esil->anal->reg, regname, -1);
 	if (reg) {
-		if (num)
+		if (num) {
 			*num = r_reg_get_value (esil->anal->reg, reg);
-		return 1;
+		}
+		return true;
 	}
-	return 0;
+	return false;
 }
-int reg_write(RAnalEsil *esil, const char *regname, ut64 num) {
+
+static bool reg_write(RAnalEsil *esil, const char *regname, ut64 num) {
 	RRegItem *reg = r_reg_get (esil->anal->reg, regname, -1);
 	if (reg) {
-		if (num)
+		if (num) {
 			r_reg_set_value (esil->anal->reg, reg,num);
-		return 1;
+		}
+		return true;
 	}
-	return 0;
+	return false;
 }
 /*
 
@@ -122,8 +127,8 @@ if (valor==0){
 return 1;
 }
 */
-int getp(const ut8 *buf, const ut8 *p0, const ut8 *p1, const ut8 *p2, const ut8 *p3, int type) {
-	const ut8 * c;
+static int getp(const ut8 *buf, const ut8 *p0, const ut8 *p1, const ut8 *p2, const ut8 *p3, int type) {
+	const ut8 * c = buf + 1;
 	const ut8  *r0;
 	const ut8  *r1;
 	const ut8  *r2;
@@ -132,157 +137,155 @@ int getp(const ut8 *buf, const ut8 *p0, const ut8 *p1, const ut8 *p2, const ut8
 	const ut32 *imm1;
 	int size=0;
 
-	c   = buf+1;
-	switch(type) {
-		case 0: // 8 8 11 5 ESIL
-			r0  = buf + 2;
-			sprintf((char *)p0,"r_%02x",*r0);
-			switch(*c) {
-				case 1:
-					r1  = buf + 3;
-					imm = (ut32 *)(buf + 4);
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"0x%04x",*imm);
-					size=8;
-					break;
-				case 2:
-					imm  = (ut32 *)(buf + 3);
-					r1   = buf + 4;
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"r_%02x",*r1);
-					size=8;
-					break;
-				case 4:
-					imm  = (ut32 *)(buf + 3);
-					imm1 = (ut32 *)(buf + 7);
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"0x%04x",*imm1);
-					size=11;
-					break;
-
-				case 0:
-				default:
-					r1  = buf + 3;
-					r2  = buf + 4;
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"r_%02x",*r2);
-					size=5;
-					break;
-			}
+	switch (type) {
+	case 0: // 8 8 11 5 ESIL
+		r0  = buf + 2;
+		sprintf((char *)p0,"r_%02x",*r0);
+		switch (*c) {
+		case 1:
+			r1  = buf + 3;
+			imm = (ut32 *)(buf + 4);
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"0x%04x",*imm);
+			size=8;
 			break;
-		case 1: // 9 9 12 6
-			r0  = buf + 2;
-			r3  = buf +3; // guarda aki el resto
-			sprintf((char *)p0,"r_%02x",*r0);
-			sprintf((char *)p3,"r_%02x",*r3);
-			switch(*c) {
-				case 1:
-					r1  = buf + 4;
-					imm =(ut32 *)(buf + 5);
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"0x%04x",*imm);
-					size=9;
-					break;
-				case 2:
-					imm  = (ut32 *)(buf + 4);
-					r1   = buf + 8;
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"r_%02x",*r1);
-					size=9;
-					break;
-				case 4:
-					imm  = (ut32 *)(buf + 4);
-					imm1 = (ut32 *)(buf + 8);
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"0x%04x",*imm1);
-					size=12;
-					break;
-				case 0:
-				default:
-					r1  = buf + 4;
-					r2  = buf + 5;
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"r_%02x",*r2);
-					size=6;
-					break;
-			}
-			break;
-		case 2: // 7 7 10 4
-			switch(*c) {
-				case 1:
-					r1  = buf + 2;
-					imm = (ut32 *)(buf + 3);
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"0x%04x",*imm);
-					size=7;
-					break;
-				case 2:
-					imm  = (ut32 *)(buf + 2);
-					r1   = buf + 6;
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"r_%02x",*r1);
-					size=7;
-					break;
-				case 4:
-					imm  = (ut32 *)(buf + 2);
-					imm1 = (ut32 *)(buf + 6);
-					sprintf((char *)p1,"0x%04x",*imm);
-					sprintf((char *)p2,"0x%04x",*imm1);
-					size=10;
-					break;
-				case 0:
-				default:
-					r1  = buf + 2;
-					r2  = buf + 3;
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"r_%02x",*r2);
-					size=4;
-			}
-			break;
-		case 3:// 7 4 ESIL
-			switch(*c) {
-				case 1:
-					r1  = buf + 2;
-					imm = (ut32 *)(buf + 3);
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"0x%04x",*imm);
-					size=7;
-					break;
-				case 0:
-				default:
-					r1  = buf + 2;
-					r2  = buf + 3;
-					sprintf((char *)p1,"r_%02x",*r1);
-					sprintf((char *)p2,"r_%02x",*r2);
-					size=4;
-					break;
-			}
-			break;
-		case 4: // 6 3
-			switch(*c) {
-				case 1:
-					imm = (ut32 *)(buf + 2);
-					sprintf((char *)p1,"0x%04x",*imm);
-					size=6;
-					break;
-				default:
-				case 0:
-					r1  = buf + 2;
-					sprintf((char *)p1,"r_%02x",*r1);
-					size=3;
-					break;
-			}
-			break;
-		case 5: //5
-			imm  = (ut32 *)(buf + 1);
+		case 2:
+			imm  = (ut32 *)(buf + 3);
+			r1   = buf + 4;
 			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"r_%02x",*r1);
+			size=8;
+			break;
+		case 4:
+			imm  = (ut32 *)(buf + 3);
+			imm1 = (ut32 *)(buf + 7);
+			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"0x%04x",*imm1);
+			size=11;
+			break;
+
+		case 0:
+		default:
+			r1  = buf + 3;
+			r2  = buf + 4;
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"r_%02x",*r2);
 			size=5;
 			break;
-		case 6://2
-			r1  = buf + 1;
+		}
+		break;
+	case 1: // 9 9 12 6
+		r0  = buf + 2;
+		r3  = buf +3; // guarda aki el resto
+		sprintf((char *)p0,"r_%02x",*r0);
+		sprintf((char *)p3,"r_%02x",*r3);
+		switch (*c) {
+		case 1:
+			r1  = buf + 4;
+			imm =(ut32 *)(buf + 5);
 			sprintf((char *)p1,"r_%02x",*r1);
-			size=2;
+			sprintf((char *)p2,"0x%04x",*imm);
+			size=9;
 			break;
+		case 2:
+			imm  = (ut32 *)(buf + 4);
+			r1   = buf + 8;
+			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"r_%02x",*r1);
+			size=9;
+			break;
+		case 4:
+			imm  = (ut32 *)(buf + 4);
+			imm1 = (ut32 *)(buf + 8);
+			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"0x%04x",*imm1);
+			size=12;
+			break;
+		case 0:
+		default:
+			r1  = buf + 4;
+			r2  = buf + 5;
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"r_%02x",*r2);
+			size=6;
+			break;
+		}
+		break;
+	case 2: // 7 7 10 4
+		switch (*c) {
+		case 1:
+			r1  = buf + 2;
+			imm = (ut32 *)(buf + 3);
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"0x%04x",*imm);
+			size=7;
+			break;
+		case 2:
+			imm  = (ut32 *)(buf + 2);
+			r1   = buf + 6;
+			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"r_%02x",*r1);
+			size=7;
+			break;
+		case 4:
+			imm  = (ut32 *)(buf + 2);
+			imm1 = (ut32 *)(buf + 6);
+			sprintf((char *)p1,"0x%04x",*imm);
+			sprintf((char *)p2,"0x%04x",*imm1);
+			size=10;
+			break;
+		case 0:
+		default:
+			r1  = buf + 2;
+			r2  = buf + 3;
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"r_%02x",*r2);
+			size=4;
+		}
+		break;
+	case 3:// 7 4 ESIL
+		switch(*c) {
+		case 1:
+			r1  = buf + 2;
+			imm = (ut32 *)(buf + 3);
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"0x%04x",*imm);
+			size=7;
+			break;
+		case 0:
+		default:
+			r1  = buf + 2;
+			r2  = buf + 3;
+			sprintf((char *)p1,"r_%02x",*r1);
+			sprintf((char *)p2,"r_%02x",*r2);
+			size=4;
+			break;
+		}
+		break;
+	case 4: // 6 3
+		switch(*c) {
+		case 1:
+			imm = (ut32 *)(buf + 2);
+			sprintf((char *)p1,"0x%04x",*imm);
+			size=6;
+			break;
+		default:
+			r1  = buf + 2;
+			sprintf ((char *)p1,"r_%02x",*r1);
+			size = 3;
+			break;
+		}
+		break;
+	case 5: //5
+		imm = (ut32 *)(buf + 1);
+		sprintf ((char *)p1,"0x%04x",*imm);
+		size = 5;
+		break;
+	case 6: //2
+		r1  = buf + 1;
+		sprintf ((char *)p1,"r_%02x",*r1);
+		size = 2;
+		break;
 	}
 	return size;
 }
@@ -310,217 +313,218 @@ static int baleful_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int l
 	op->refptr = 0;
 	r_strbuf_init (&op->esil);
 	switch (buf[0]) {
-		case 2: // 8 8 11 5  ADD +
-			op->type = R_ANAL_OP_TYPE_ADD;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,+,%s,=",p2,p1,p0);
-			break;
-		case 3: // 8 8 11 5  SUB -
-			op->type = R_ANAL_OP_TYPE_SUB;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,-,%s,=",p2,p1,p0);
-			break;
-		case 4: // 8 8 11 5  MUL *
-			op->type = R_ANAL_OP_TYPE_MUL;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,*,%s,=",p2,p1,p0);
-			break;
-		case 6: // 8 8 11 5  XOR ^
-			op->type = R_ANAL_OP_TYPE_XOR;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,^,%s,=",p2,p1,p0);
-			break;
-		case 9: // 8 8 11 5  AND &
-			op->type = R_ANAL_OP_TYPE_AND;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,&,%s,=",p2,p1,p0);
-			break;
-		case 10: // 8 8 11 5 OR |
-			op->type = R_ANAL_OP_TYPE_OR;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,|,%s,=",p2,p1,p0);
-			break;
-		case 12: // 8 8 11 5 ROL <<<<
-			op->type = R_ANAL_OP_TYPE_ROL;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,<<<<,%s,=",p2,p1,p0);
-			break;
-		case 13: // 8 8 11 5 ROR >>>>
-			op->type = R_ANAL_OP_TYPE_ROR;
-			op->size = getp(buf,p0,p1,p2,p3,0);
-			r_strbuf_setf (&op->esil, "%s,%s,>>>>,%s,=",p2,p1,p0);
-			break;
-		case 25: //          ++
-			op->type = R_ANAL_OP_TYPE_ADD;
-			op->size = getp(buf,p0,p1,p2,p3,6);
-			r_strbuf_setf (&op->esil, "%s,++,=",p1);
-			break;
-		case 26: //          --
-			op->type = R_ANAL_OP_TYPE_SUB;
-			op->size = getp(buf,p0,p1,p2,p3,6);
-			r_strbuf_setf (&op->esil, "%s,--,=",p1);
-			break;
-			////////////////////////////////////////// SPECIAL DIV/MOD ////////////////////////////////
-		case 5: // 9 9 12 6  DIV
-			op->type = R_ANAL_OP_TYPE_DIV;
-			op->size = getp(buf,p0,p1,p2,p3,1);
-			r_strbuf_setf (&op->esil, "%s,%s,/,%s,=,%s,%s,%%,%s,=",p2,p1,p0,p2,p1,p3);
-			break;
-			////////////////////////////////// MOVS ///////////////////////////////////////////////////
-		case 24: //7 4       MOV
-			op->type = R_ANAL_OP_TYPE_MOV;
-			op->size = getp(buf,p0,p1,p2,p3,3);
-			r_strbuf_setf (&op->esil, "%s,%s,=",p2,p1);
-			break;
-		case 27: //          MOV r,[r]
-			r  = buf + 1;
-			r1 = buf + 2;
-			op->type = R_ANAL_OP_TYPE_MOV;
-			op->size = 3;
-			r_strbuf_setf (&op->esil, "r_%02x,[4],r_%02x,=",*r1,*r);
-			break;
-		case 28://           MOV [r],r1
-			r  = buf + 1;
-			r1 = buf + 2;
-			op->type = R_ANAL_OP_TYPE_MOV;
-			op->size = 3;
-			r_strbuf_setf (&op->esil, "r_%02x,r_%02x,=[4]",*r1,*r);
-			break;
-			///////////////////////////////// JUMPS /////////////////////////////////////////////////
-		case 14: //5         JMP
-			imm  = (ut32 *)(buf + 1);
-			op->type = R_ANAL_OP_TYPE_JMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			r_strbuf_setf(&op->esil,"%s,pc,=",p1);
-			break;
-		case 16: //5         JZ
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil, "zf,?{,%s,pc,=,}",p1);
-			break;
-		case 21: //5         JNZ
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil, "zf,!,?{,%s,pc,=,}",p1);
-			break;
-		case 17: //5         JS
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil, "sf,?{,%s,pc,=,}",p1);
-			break;
-		case 20: //5         JNS
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil, "sf,!,?{,%s,pc,=,}",p1);
-			break;
-		case 19: //5         JG
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil, "gf,?{,%s,pc,=,}",p1);
-			break;
-		case 18: //5         JBE
-			op->type = R_ANAL_OP_TYPE_CJMP;
-			op->size = getp (buf, p0, p1, p2, p3, 5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf (&op->esil, "gf,!,?{,%s,pc,=,}",p1);
-			break;
-			////////////////////////////////   EFLAGS WRITER  ///////////////////////////////////////////////////////////
-			// http://www.read.seas.harvard.edu/~kohler/class/aosref/i386/appc.htm
-			//http://sourceforge.net/p/fake86/code/ci/master/tree/src/fake86/cpu.c
-		case 22: // 7 7 10 4 AND
-			op->type = R_ANAL_OP_TYPE_AND;
-			op->size = getp(buf,p0,p1,p2,p3,2);
-			r_strbuf_setf(&op->esil,"0,sf,=,%s,%s,<,sf,=,0,zf,=,%s,%s,&,0,==,$z,zf,=,0,gf,=",p2,p1,p2,p1);
-			break;
-		case 23: // 7 7 10 4 CMP
-			op->type = R_ANAL_OP_TYPE_SUB;
-			op->size = getp(buf,p0,p1,p2,p3,2);
-			r_strbuf_setf(&op->esil,"0,sf,=,%s,%s,<,sf,=,0,zf,=,%s,%s,==,$z,zf,=,0,gf,=,%s,%s,>,gf,=",p2,p1,p2,p1,p2,p1);
-			//"0,sf,=,%s,%s,<,sf,="      //SF
-			//"0,zf,=,%s,%s,==,%%z,zf,=" //ZF
-			//"0,gf,=,%s,%s,>,gf,="      //GF
-			break;
-			/////////////////////////////////////// STACK ////////////////////////////////////////////////////////////
-		case 30: //6 3       PUSH
-			p = buf + 1;
-			op->type = R_ANAL_OP_TYPE_PUSH;
-			op->size = getp(buf,p0,p1,p2,p3,4);
-			r_strbuf_setf(&op->esil,"%s,stk,=[4],4,stk,+=",p1);
-			break;
-		case 31: //          POP
-			op->type = R_ANAL_OP_TYPE_POP;
-			op->size = getp(buf,p0,p1,p2,p3,6);
-			r_strbuf_setf(&op->esil,"4,stk,-=,stk,[4],%s,=",p1);
-			break;
-		case 15: //5         CALL
-			imm = (ut32 *)(buf + 1);
-			op->type = R_ANAL_OP_TYPE_CALL;
-			op->size = getp(buf,p0,p1,p2,p3,5);
-			op->jump = r_num_get (NULL, (const char *)p1);
-			op->fail = addr + op->size;
-			r_strbuf_setf(&op->esil,"%04x,$$,+,stk,=[4],4,stk,+=,%s,pc,=",op->size,p1);
-			break;
-		case 1:  //          RET
-			op->type = R_ANAL_OP_TYPE_RET;
-			op->size = 1;
-			r_strbuf_setf(&op->esil,"4,stk,-=,stk,[4],pc,=");
-			break;
-			///////////////////////////////////////////////////////////////////////////////////////////////////////////
-		case 11:
-			r_strbuf_setf (&op->esil, "regX = regY==0");
-			op->size = 3;
-			break;
-		case 7:
-			r_strbuf_setf (&op->esil, "regX = NEG regY");
-			op->size = 3;
-			break;
-		case 8:
-			r_strbuf_setf (&op->esil, "regX = NOT regY");
-			op->size = 3;
-			break;
-			///////////////////////////////////////////////////////////////////////////////////////////////////////////
-		case 32: //          SYSCALL
-			p = buf + 1;
-			op->type = R_ANAL_OP_TYPE_SWI;
-			op->size = 2;
-			r_strbuf_setf (&op->esil, "0x%02x,$",*p);
-			break;
-		case 29://           VMEND
-			op->type = R_ANAL_OP_TYPE_TRAP;
-			op->size = 1;
-			r_strbuf_setf (&op->esil, "end virtual");
-			break;
-		case 0://            NOP
-		default:
-			op->type = R_ANAL_OP_TYPE_NOP;
-			op->size = 1;
-			r_strbuf_setf (&op->esil, "nop");
-			break;
+	case 2: // 8 8 11 5  ADD +
+		op->type = R_ANAL_OP_TYPE_ADD;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,+,%s,=",p2,p1,p0);
+		break;
+	case 3: // 8 8 11 5  SUB -
+		op->type = R_ANAL_OP_TYPE_SUB;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,-,%s,=",p2,p1,p0);
+		break;
+	case 4: // 8 8 11 5  MUL *
+		op->type = R_ANAL_OP_TYPE_MUL;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,*,%s,=",p2,p1,p0);
+		break;
+	case 6: // 8 8 11 5  XOR ^
+		op->type = R_ANAL_OP_TYPE_XOR;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,^,%s,=",p2,p1,p0);
+		break;
+	case 9: // 8 8 11 5  AND &
+		op->type = R_ANAL_OP_TYPE_AND;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,&,%s,=",p2,p1,p0);
+		break;
+	case 10: // 8 8 11 5 OR |
+		op->type = R_ANAL_OP_TYPE_OR;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,|,%s,=",p2,p1,p0);
+		break;
+	case 12: // 8 8 11 5 ROL <<<
+		op->type = R_ANAL_OP_TYPE_ROL;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,<<<,%s,=",p2,p1,p0);
+		break;
+	case 13: // 8 8 11 5 ROR >>>
+		op->type = R_ANAL_OP_TYPE_ROR;
+		op->size = getp(buf,p0,p1,p2,p3,0);
+		r_strbuf_setf (&op->esil, "%s,%s,>>>,%s,=",p2,p1,p0);
+		break;
+	case 25: //          ++
+		op->type = R_ANAL_OP_TYPE_ADD;
+		op->size = getp(buf,p0,p1,p2,p3,6);
+		r_strbuf_setf (&op->esil, "%s,++,=",p1);
+		break;
+	case 26: //          --
+		op->type = R_ANAL_OP_TYPE_SUB;
+		op->size = getp(buf,p0,p1,p2,p3,6);
+		r_strbuf_setf (&op->esil, "%s,--,=",p1);
+		break;
+		////////////////////////////////////////// SPECIAL DIV/MOD ////////////////////////////////
+	case 5: // 9 9 12 6  DIV
+		op->type = R_ANAL_OP_TYPE_DIV;
+		op->size = getp(buf,p0,p1,p2,p3,1);
+		r_strbuf_setf (&op->esil, "%s,%s,/,%s,=,%s,%s,%%,%s,=",p2,p1,p0,p2,p1,p3);
+		break;
+		////////////////////////////////// MOVS ///////////////////////////////////////////////////
+	case 24: //7 4       MOV
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->size = getp(buf,p0,p1,p2,p3,3);
+		r_strbuf_setf (&op->esil, "%s,%s,=",p2,p1);
+		break;
+	case 27: //          MOV r,[r]
+		r  = buf + 1;
+		r1 = buf + 2;
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->size = 3;
+		r_strbuf_setf (&op->esil, "r_%02x,[4],r_%02x,=",*r1,*r);
+		break;
+	case 28://           MOV [r],r1
+		r  = buf + 1;
+		r1 = buf + 2;
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->size = 3;
+		r_strbuf_setf (&op->esil, "r_%02x,r_%02x,=[4]",*r1,*r);
+		break;
+		///////////////////////////////// JUMPS /////////////////////////////////////////////////
+	case 14: //5         JMP
+		imm  = (ut32 *)(buf + 1);
+		op->type = R_ANAL_OP_TYPE_JMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		r_strbuf_setf(&op->esil,"%s,pc,=",p1);
+		break;
+	case 16: //5         JZ
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil, "zf,?{,%s,pc,=,}",p1);
+		break;
+	case 21: //5         JNZ
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil, "zf,!,?{,%s,pc,=,}",p1);
+		break;
+	case 17: //5         JS
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil, "sf,?{,%s,pc,=,}",p1);
+		break;
+	case 20: //5         JNS
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil, "sf,!,?{,%s,pc,=,}",p1);
+		break;
+	case 19: //5         JG
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil, "gf,?{,%s,pc,=,}",p1);
+		break;
+	case 18: //5         JBE
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->size = getp (buf, p0, p1, p2, p3, 5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf (&op->esil, "gf,!,?{,%s,pc,=,}",p1);
+		break;
+		////////////////////////////////   EFLAGS WRITER  ///////////////////////////////////////////////////////////
+		// http://www.read.seas.harvard.edu/~kohler/class/aosref/i386/appc.htm
+		//http://sourceforge.net/p/fake86/code/ci/master/tree/src/fake86/cpu.c
+	case 22: // 7 7 10 4 AND
+		op->type = R_ANAL_OP_TYPE_AND;
+		op->size = getp(buf,p0,p1,p2,p3,2);
+		r_strbuf_setf(&op->esil,"0,sf,=,%s,%s,<,sf,=,0,zf,=,%s,%s,&,0,==,$z,zf,=,0,gf,=",p2,p1,p2,p1);
+		break;
+	case 23: // 7 7 10 4 CMP
+		op->type = R_ANAL_OP_TYPE_SUB;
+		op->size = getp(buf,p0,p1,p2,p3,2);
+		r_strbuf_setf(&op->esil,"0,sf,=,%s,%s,<,sf,=,0,zf,=,%s,%s,==,$z,zf,=,0,gf,=,%s,%s,>,gf,=",p2,p1,p2,p1,p2,p1);
+		//"0,sf,=,%s,%s,<,sf,="      //SF
+		//"0,zf,=,%s,%s,==,%%z,zf,=" //ZF
+		//"0,gf,=,%s,%s,>,gf,="      //GF
+		break;
+		/////////////////////////////////////// STACK ////////////////////////////////////////////////////////////
+	case 30: //6 3       PUSH
+		p = buf + 1;
+		op->type = R_ANAL_OP_TYPE_PUSH;
+		op->size = getp(buf,p0,p1,p2,p3,4);
+		r_strbuf_setf(&op->esil,"%s,stk,=[4],4,stk,+=",p1);
+		break;
+	case 31: //          POP
+		op->type = R_ANAL_OP_TYPE_POP;
+		op->size = getp(buf,p0,p1,p2,p3,6);
+		r_strbuf_setf(&op->esil,"4,stk,-=,stk,[4],%s,=",p1);
+		break;
+	case 15: //5         CALL
+		imm = (ut32 *)(buf + 1);
+		op->type = R_ANAL_OP_TYPE_CALL;
+		op->size = getp(buf,p0,p1,p2,p3,5);
+		op->jump = r_num_get (NULL, (const char *)p1);
+		op->fail = addr + op->size;
+		r_strbuf_setf(&op->esil,"%04x,$$,+,stk,=[4],4,stk,+=,%s,pc,=",op->size,p1);
+		break;
+	case 1:  //          RET
+		op->type = R_ANAL_OP_TYPE_RET;
+		op->size = 1;
+		r_strbuf_setf(&op->esil,"4,stk,-=,stk,[4],pc,=");
+		break;
+		///////////////////////////////////////////////////////////////////////////////////////////////////////////
+	case 11:
+		r_strbuf_setf (&op->esil, "regX = regY==0");
+		op->size = 3;
+		break;
+	case 7:
+		r_strbuf_setf (&op->esil, "regX = NEG regY");
+		op->size = 3;
+		break;
+	case 8:
+		r_strbuf_setf (&op->esil, "regX = NOT regY");
+		op->size = 3;
+		break;
+		///////////////////////////////////////////////////////////////////////////////////////////////////////////
+	case 32: //          SYSCALL
+		p = buf + 1;
+		op->type = R_ANAL_OP_TYPE_SWI;
+		op->size = 2;
+		r_strbuf_setf (&op->esil, "0x%02x,$",*p);
+		break;
+	case 29://           VMEND
+		op->type = R_ANAL_OP_TYPE_TRAP;
+		op->size = 1;
+		r_strbuf_setf (&op->esil, "end virtual");
+		break;
+	case 0://            NOP
+	default:
+		op->type = R_ANAL_OP_TYPE_NOP;
+		op->size = 1;
+		r_strbuf_setf (&op->esil, "nop");
+		break;
 	}
 	return op->size;
 }
 
-void *  internalMemory=NULL;
-int indicememoria=0;
-ut32 vtmp=0;
-ut32 idxInputText=0;
-char texto[] ="packers_and_vms_and_xors_oh_my\n";
+static void *  internalMemory = NULL;
+static int indicememoria = 0;
+static ut32 vtmp = 0;
+static ut32 idxInputText = 0;
+static char texto[] ="packers_and_vms_and_xors_oh_my\n";
+
 static int esil_baleful_intr (RAnalEsil *esil, int intr) {
 	ut64 valor1;
 	if (!esil)
-		return R_FALSE;
+		return false;
 	if (intr==0) {
 		reg_read(esil,"r_00",&valor1);
 		eprintf("%c\n",(ut32)valor1);
@@ -539,66 +543,75 @@ static int esil_baleful_intr (RAnalEsil *esil, int intr) {
 	}
 	else
 		eprintf ("INTERRUPT 0x%02x \n", intr);
-	return R_TRUE;
+	return true;
+}
+
+static bool esil_bale_interrupt_wrapper_cb (RAnalEsil *esil, ut32 interrupt, void *user) {	//user is always NULL, bc we has no init and fini
+	return !!esil_baleful_intr (esil, interrupt);
 }
 
 static int set_reg_profile(RAnal *anal) {
 	const char *p = \
-			"=PC    pc\n"
-			"=SP    stk\n"
-			"gpr    pc      .32 0   0\n"
-			"gpr    stk     .32 4   0\n"
-			"gpr    zf      .32 8   0\n"
-			"gpr    sf      .32 12  0\n"
-			"gpr    gf      .32 16  0\n"
-			"gpr    r_00    .32 20  0\n"
-			"gpr    r_01    .32 24  0\n"
-			"gpr    r_02    .32 28  0\n"
-			"gpr    r_03    .32 32  0\n"
-			"gpr    r_04    .32 36  0\n"
-			"gpr    r_05    .32 40  0\n"
-			"gpr    r_06    .32 44  0\n"
-			"gpr    r_07    .32 48  0\n"
-			"gpr    r_08    .32 52  0\n"
-			"gpr    r_09    .32 56  0\n"
-			"gpr    r_0a    .32 60  0\n"
-			"gpr    r_0b    .32 64  0\n"
-			"gpr    r_0c    .32 68  0\n"
-			"gpr    r_0d    .32 72  0\n"
-			"gpr    r_0e    .32 76  0\n"
-			"gpr    r_0f    .32 80  0\n"
-			"gpr    r_10    .32 84  0\n"
-			"gpr    r_11    .32 88  0\n"
-			"gpr    r_12    .32 92  0\n"
-			"gpr    r_13    .32 96  0\n"
-			"gpr    r_14    .32 100 0\n"
-			"gpr    r_15    .32 104 0\n"
-			"gpr    r_16    .32 108 0\n"
-			"gpr    r_17    .32 112 0\n"
-			"gpr    r_18    .32 116 0\n"
-			"gpr    r_19    .32 120 0\n"
-			"gpr    r_1a    .32 124 0\n"
-			"gpr    r_1b    .32 128 0\n"
-			"gpr    r_1c    .32 132 0\n"
-			"gpr    r_1d    .32 136 0\n"
-			"gpr    r_1e    .32 140 0\n"
-			"gpr    r_1f    .32 144 0\n"
-			"gpr    r_20    .32 148 0\n"
-			"gpr    r_21    .32 152 0\n"
-			"gpr    r_22    .32 156 0\n"
-			"gpr    r_23    .32 160 0\n"
-			"gpr    r_24    .32 168 0\n"
-			"gpr    r_25    .32 172 0\n"
-			"gpr    r_26    .32 176 0\n"
-			"gpr    r_27    .32 180 0\n"
-			"gpr    r_28    .32 184 0\n"
-			"gpr    r_29    .32 188 0\n"
-			"gpr    r_data  .32 192 0\n";
+		"=PC    pc\n"
+		"=SP    stk\n"
+		"gpr    pc      .32 0   0\n"
+		"gpr    stk     .32 4   0\n"
+		"gpr    zf      .32 8   0\n"
+		"gpr    sf      .32 12  0\n"
+		"gpr    gf      .32 16  0\n"
+		"gpr    r_00    .32 20  0\n"
+		"gpr    r_01    .32 24  0\n"
+		"gpr    r_02    .32 28  0\n"
+		"gpr    r_03    .32 32  0\n"
+		"gpr    r_04    .32 36  0\n"
+		"gpr    r_05    .32 40  0\n"
+		"gpr    r_06    .32 44  0\n"
+		"gpr    r_07    .32 48  0\n"
+		"gpr    r_08    .32 52  0\n"
+		"gpr    r_09    .32 56  0\n"
+		"gpr    r_0a    .32 60  0\n"
+		"gpr    r_0b    .32 64  0\n"
+		"gpr    r_0c    .32 68  0\n"
+		"gpr    r_0d    .32 72  0\n"
+		"gpr    r_0e    .32 76  0\n"
+		"gpr    r_0f    .32 80  0\n"
+		"gpr    r_10    .32 84  0\n"
+		"gpr    r_11    .32 88  0\n"
+		"gpr    r_12    .32 92  0\n"
+		"gpr    r_13    .32 96  0\n"
+		"gpr    r_14    .32 100 0\n"
+		"gpr    r_15    .32 104 0\n"
+		"gpr    r_16    .32 108 0\n"
+		"gpr    r_17    .32 112 0\n"
+		"gpr    r_18    .32 116 0\n"
+		"gpr    r_19    .32 120 0\n"
+		"gpr    r_1a    .32 124 0\n"
+		"gpr    r_1b    .32 128 0\n"
+		"gpr    r_1c    .32 132 0\n"
+		"gpr    r_1d    .32 136 0\n"
+		"gpr    r_1e    .32 140 0\n"
+		"gpr    r_1f    .32 144 0\n"
+		"gpr    r_20    .32 148 0\n"
+		"gpr    r_21    .32 152 0\n"
+		"gpr    r_22    .32 156 0\n"
+		"gpr    r_23    .32 160 0\n"
+		"gpr    r_24    .32 168 0\n"
+		"gpr    r_25    .32 172 0\n"
+		"gpr    r_26    .32 176 0\n"
+		"gpr    r_27    .32 180 0\n"
+		"gpr    r_28    .32 184 0\n"
+		"gpr    r_29    .32 188 0\n"
+		"gpr    r_data  .32 192 0\n";
 	return r_reg_set_profile_string (anal->reg, p);
 }
 static int esil_baleful_init (RAnalEsil *esil) {
-	if (!esil)
-		return R_FALSE;
+	if (!esil) {
+		return false;
+	}
+	r_anal_esil_set_interrupt(esil,0,esil_bale_interrupt_wrapper_cb, NULL);
+	r_anal_esil_set_interrupt(esil,4,esil_bale_interrupt_wrapper_cb, NULL);
+	r_anal_esil_set_interrupt(esil,11,esil_bale_interrupt_wrapper_cb, NULL);
+	return true;
 	/*
 	   internalMemory=malloc(4096);
 	   if (!internalMemory) {
@@ -609,15 +622,15 @@ static int esil_baleful_init (RAnalEsil *esil) {
 	 *((ut32 *)internalMemory)=0xdeadbeef;
 	 eprintf("leido :%08x\n",*((ut32 *)internalMemory));
 	 */
-	return R_TRUE;
 }
 
 static int esil_baleful_fini (RAnalEsil *esil) {
 	//	if (internalMemory)
 	//		free(internalMemory);
-	return R_TRUE;
+	return true;
 }
-struct r_anal_plugin_t r_anal_plugin_baleful = {
+
+static RAnalPlugin r_anal_plugin_baleful = {
 	.name = "baleful",
 	.desc = "baleful code analysis plugin",
 	.license = "LGPL3",
@@ -626,16 +639,13 @@ struct r_anal_plugin_t r_anal_plugin_baleful = {
 	.bits = 32,
 	.esil_init = esil_baleful_init,
 	.esil_fini = esil_baleful_fini,
-	.esil_intr = esil_baleful_intr,
-	.esil = R_TRUE,
+	.esil = true,
 	.op = &baleful_op,
 	.set_reg_profile = set_reg_profile,
 };
 
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_ANAL,
 	.data = &r_anal_plugin_baleful,
 	.version = R2_VERSION
 };
-#endif

baleful/asm/asm_baleful.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2014-2015 - SkUaTeR */
+/* radare - LGPL - Copyright 2014-2016 - SkUaTeR */
 
 #include <stdio.h>
 #include <string.h>
@@ -6,21 +6,20 @@
 #include <r_lib.h>
 #include <r_asm.h>
 
-int asm_baleful_getregs(const ut8 *buf, char * b, char * oper, int type) {
-	const ut8 * c;
-	const ut8  *r0;
-	const ut8  *r1;
-	const ut8  *r2;
-	const ut8  *r3;
+static int asm_baleful_getregs(const ut8 *buf, char * b, char * oper, int type) {
+	const ut8 *c = buf + 1;
+	const ut8 *r0;
+	const ut8 *r1;
+	const ut8 *r2;
+	const ut8 *r3;
 	const ut32 *imm;
 	const ut32 *imm1;
+	int size = 0;
 
-	int size=0;
-	c   = buf+1;
-	switch(type) {
+	switch (type) {
 	case 0: // 8 8 11 5
 		r0  = buf + 2;
-		switch(*c) {
+		switch (*c) {
 		case 1:
 			r1  = buf + 3;
 			imm = (ut32*)(buf + 4);
@@ -212,128 +211,129 @@ static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	const ut8  *r1;
 	const ut32 *imm;
 	const ut32 *imm1;
-
+	char outbuf[32] = {0};
 	switch (*buf) {
 	case 2://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"+",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"+",0);
 		break;
 	case 3://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"-",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"-",0);
 		break;
 	case 4://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"*",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"*",0);
 		break;
 	case 6://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"^",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"^",0);
 		break;
 	case 9://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"&",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"&",0);
 		break;
 	case 10://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"|",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"|",0);
 		break;
 	case 12://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"<<",0);
+		op->size = asm_baleful_getregs(buf,outbuf,"<<",0);
 		break;
 	case 13://8 8 11 5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,">>",0);
+		op->size = asm_baleful_getregs(buf,outbuf,">>",0);
 		break;
 	case 5: // //9 9 12 6
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"/",1);
+		op->size = asm_baleful_getregs(buf,outbuf,"/",1);
 		break;
 	case 22: // 7 7 10 4
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"and",2);
+		op->size = asm_baleful_getregs(buf,outbuf,"and",2);
 		break;
 	case 23: // 7 7 10 4
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"cmp",2);
+		op->size = asm_baleful_getregs(buf,outbuf,"cmp",2);
 		break;
 	case 24: //7 4
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"mov",3);
+		op->size = asm_baleful_getregs(buf,outbuf,"mov",3);
 		break;
 	case 30: // 6 3
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"push",4);
+		op->size = asm_baleful_getregs(buf,outbuf,"push",4);
 		break;
 	case 15: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"call",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"call",5);
 		break;
 	case 14: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jmp",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jmp",5);
 		break;
 	case 16: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jz",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jz",5);
 		break;
 	case 17: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"js",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"js",5);
 		break;
 	case 18: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jbe",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jbe",5);
 		break;
 	case 19: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jg",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jg",5);
 		break;
 	case 20: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jns",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jns",5);
 		break;
 	case 21: //5
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"jnz",5);
+		op->size = asm_baleful_getregs(buf,outbuf,"jnz",5);
 		break;
 	case 27: //3
 		op->size = 3;
 		r  = buf + 1;
 		r1 = buf + 2;
-		snprintf (op->buf_asm, R_ASM_BUFSIZE, "mov r_%02x,[r_%02x]",*r,*r1);
+		snprintf (outbuf, sizeof (outbuf), "mov r_%02x,[r_%02x]",*r,*r1);
 		break;
 	case 28: //3
 		r  = buf + 1;
 		r1 = buf + 2;
 		op->size = 3;
-		snprintf (op->buf_asm, R_ASM_BUFSIZE, "mov [r_%02x],r_%02x",*r,*r1);
+		snprintf (outbuf, sizeof (outbuf), "mov [r_%02x],r_%02x",*r,*r1);
 		break;
 	case 11: //3
 		op->size = 3;
-		snprintf (op->buf_asm, R_ASM_BUFSIZE, "regX= regY==0");
+		snprintf (outbuf, sizeof (outbuf), "regX= regY==0");
 		break;
 	case 7: //3
 		op->size = 3;
-		snprintf (op->buf_asm, R_ASM_BUFSIZE, "regX= NEG regY");
+		snprintf (outbuf, sizeof (outbuf), "regX= NEG regY");
 		break;
 	case 8: //3
 		op->size = 3;
-		snprintf (op->buf_asm, R_ASM_BUFSIZE, "regX= NOT regY");
+		snprintf (outbuf, sizeof (outbuf), "regX= NOT regY");
 		break;
 	case 25: //2
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"++",6);
+		op->size = asm_baleful_getregs(buf,outbuf,"++",6);
 		break;
 	case 26: //2
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"--",6);
+		op->size = asm_baleful_getregs(buf,outbuf,"--",6);
 		break;
 	case 31: //2
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"pop",6);
+		op->size = asm_baleful_getregs(buf,outbuf,"pop",6);
 		break;
 	case 32: // 2
-		op->size = asm_baleful_getregs(buf,op->buf_asm,"apicall",7);
+		op->size = asm_baleful_getregs(buf,outbuf,"apicall",7);
 		break;
 	case 1:
 		op->size = 1;
-		strcpy (op->buf_asm, "ret");
+		strcpy (outbuf, "ret");
 		break;
 	case 0:
 		op->size = 1;
-		strcpy (op->buf_asm, "nop");
+		strcpy (outbuf, "nop");
 		break;
 	case 29:
 		op->size = 1;
-		strcpy (op->buf_asm, "end virtual");
+		strcpy (outbuf, "end virtual");
 		break;
 	default:
 		op->size = 1;
-		strcpy (op->buf_asm, "nop");
+		strcpy (outbuf, "nop");
 		break;
 	}
+	r_strbuf_set (&op->buf_asm, outbuf);
 	return op->size;
 }
 
-RAsmPlugin r_asm_plugin_baleful = {
+static RAsmPlugin r_asm_plugin_baleful = {
 	.name = "baleful",
 	.arch = "baleful",
 	.license = "LGPL3",
@@ -343,10 +343,7 @@ RAsmPlugin r_asm_plugin_baleful = {
 	//.assemble =null// &assemble
 };
 
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_ASM,
 	.data = &r_asm_plugin_baleful
-
 };
-#endif

bcl/Makefile

@@ -1,10 +1,11 @@
 include ../options.mk
 
 CFLAGS+=$(shell pkg-config --cflags r_util)
-CC_ASM=$(CC) $(CFLAGS) $(LDFLAGS) $(shell pkg-config --libs r_asm)
-CC_ANA=$(CC) $(CFLAGS) $(LDFLAGS) $(shell pkg-config --libs r_anal)
-CC_BIN=$(CC) $(CFLAGS) $(LDFLAGS) $(shell pkg-config --libs r_bin)
-CC_COR=$(CC) $(CFLAGS) $(LDFLAGS) $(shell pkg-config --libs r_core)
+CC_LIB=$(CC) -shared $(CFLAGS) $(LDFLAGS) -fPIC
+CC_ASM=$(CC_LIB) $(shell pkg-config --libs r_asm)
+CC_ANA=$(CC_LIB) $(shell pkg-config --libs r_anal)
+CC_BIN=$(CC_LIB) $(shell pkg-config --libs r_bin)
+CC_COR=$(CC_LIB) $(shell pkg-config --libs r_core)
 
 all:
 	$(CC_ASM) -o asm_bcl.$(LIBEXT) asm_bcl.c

bcl/anal_bcl.c

@@ -37,7 +37,7 @@ static int findpair(ut64 addr, const ut8 *buf, int len, int base) {
 	return 0;
 }
 
-static int bcl_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
+static int bcl_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAnalOpMask mask) {
 	int i;
 	char cache[256] = {0};
 	ut64 dst = 0LL;
@@ -76,7 +76,7 @@ static int bcl_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
 	return op->size;
 }
 
-static int set_reg_profile(RAnal *anal) {
+static bool set_reg_profile(RAnal *anal) {
 	const char *p = \
 		"=PC	pc\n"
 		"=SP	sp\n"
@@ -93,7 +93,7 @@ static int set_reg_profile(RAnal *anal) {
 	return r_reg_set_profile_string (anal->reg, p);
 }
 
-struct r_anal_plugin_t r_anal_plugin_bcl = {
+RAnalPlugin r_anal_plugin_bcl = {
 	.name = "bcl",
 	.desc = "Base Call DNA Illumina records",
 	.license = "BSD",
@@ -101,7 +101,7 @@ struct r_anal_plugin_t r_anal_plugin_bcl = {
 	.bits = 8,
 	.esil = true,
 	.op = &bcl_op,
-	.set_reg_profile = set_reg_profile,
+	.set_reg_profile = &set_reg_profile
 };
 
 #ifndef CORELIB

bcl/asm_bcl.c

@@ -9,21 +9,23 @@ static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	const char *bases = "ACGT";
 	if (a->pc == 0) {
 		ut32 *clusters = (ut32*)buf;
-		snprintf (op->buf_asm, sizeof (op->buf_asm), "clusters %d\n", *clusters);
+		r_strbuf_setf (&op->buf_asm, "clusters %d", *clusters);
+		// snprintf (op->buf_asm, sizeof (op->buf_asm), "clusters %d\n", *clusters);
 		return op->size = 4;
 	}
 	if (*buf != 0) {
 		char base = bases[*buf & 3];
 		int qual = *buf >> 2;
-		snprintf (op->buf_asm, sizeof (op->buf_asm), "%c ; %d", base, qual);
+		r_strbuf_setf (&op->buf_asm, "%c ; %d", base, qual);
 		op->size = 1;
 		return 1;
 	}
-	strcpy (op->buf_asm, ".");
+	r_strbuf_setf (&op->buf_asm, ".");
 	return 0;
 }
 
 static int assemble(RAsm *a, RAsmOp *op, const char *buf) {
+#if 0
 	bool qmode = false;
 	int quality = 0;
 	int outsz = 128;
@@ -76,6 +78,7 @@ static int assemble(RAsm *a, RAsmOp *op, const char *buf) {
 		out[op->size] = (quality<<2) | base;
 		op->size ++;
 	}
+#endif
 	return op->size;
 }
 

bcl/bin_bcl.c

@@ -5,8 +5,11 @@
 #include <r_lib.h>
 #include <r_bin.h>
 
-static int check_bytes(const ut8 *buf, ut64 length) {
-	if (buf && length >= 4) {
+static bool __check_buffer(RBinFile *bf, RBuffer *b) {
+	ut8 buf[8];
+	int length = r_buf_size (b);
+	int r = r_buf_read_at (b, 0, buf, sizeof (buf));
+	if (r == sizeof (buf)) {
 		ut32 cls = r_mem_get_num (buf, 4);
 		ut32 cls2 = r_mem_get_num (buf + 4, 4);
 		if (cls + 4 == length && !cls2) {
@@ -16,65 +19,49 @@ static int check_bytes(const ut8 *buf, ut64 length) {
 	return false;
 }
 
-static int check(RBinFile *arch) {
-	const ut8 *bytes = arch ? r_buf_buffer (arch->buf) : NULL;
-	ut64 sz = arch ? r_buf_size (arch->buf): 0;
-	return check_bytes (bytes, sz);
+static bool load_buffer(RBinFile *bf, void **bin_obj, RBuffer *buf, ut64 loadaddr, Sdb *sdb) {
+	return __check_buffer (bf, buf);
 }
 
-
-static Sdb* get_sdb (RBinObject *o) {
-	if (!o) return NULL;
-	//struct r_bin_[NAME]_obj_t *bin = (struct r_bin_r_bin_[NAME]_obj_t *) o->bin_obj;
-	//if (bin->kv) return kv;
-	return NULL;
-}
-
-static void * load_bytes(RBinFile *arch, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb){
-	return (void*)(size_t)check_bytes (buf, sz);
-}
-
-static int load(RBinFile *arch) {
-	return check(arch);
-}
-
-static int destroy (RBinFile *arch) {
-	return true;
-}
-
-static ut64 baddr(RBinFile *arch) {
+static ut64 baddr(RBinFile *bf) {
 	return 4;
 }
 
-static RBinAddr* binsym(RBinFile *arch, int type) {
+static RBinAddr* binsym(RBinFile *bf, int type) {
 	return NULL; // TODO
 }
 
 static ut64 findEntry(RBuffer *buf, int n) {
+	ut8 b;
+	ut64 buf_size = r_buf_size (buf);
 	int i;
-	for (i=4;i<buf->length; i++) {
-		if (buf->buf[i] != 0) {
+	for (i = 4; i < buf_size; i++) {
+		if (r_buf_read_at (buf, i, &b, 1) != 1) {
+			break;
+		}
+		if (b != 0) {
 			if (n == 0) {
 				return i;
 			}
 			n--;
-			for (++i; i<buf->length; i++) {
-				if (!buf->buf[i])
+			for (++i; i < buf_size && b; i++) {
+				if (r_buf_read_at (buf, i, &b, 1) != 1) {
 					break;
+				}
 			}
 		}
 	}
 	return 0;
 }
 
-static RList* entries(RBinFile *arch) {
+static RList* entries(RBinFile *bf) {
 	RList* ret = r_list_newf (free);
 	RBinAddr *ptr = NULL;
 	if (ret) {
 		if ((ptr = R_NEW0 (RBinAddr))) {
-			ut64 entry = findEntry (arch->buf, 2);
-			if (!entry) entry = findEntry (arch->buf, 1);
-			if (!entry) entry = findEntry (arch->buf, 0);
+			ut64 entry = findEntry (bf->buf, 2);
+			if (!entry) entry = findEntry (bf->buf, 1);
+			if (!entry) entry = findEntry (bf->buf, 0);
 			if (!entry) entry = 4;
 			ptr->paddr = entry;
 			ptr->vaddr = entry;
@@ -87,79 +74,74 @@ static RList* entries(RBinFile *arch) {
 	return ret;
 }
 
-static RList* sections(RBinFile *arch) {
+static RList* sections(RBinFile *bf) {
 	RList *ret = NULL;
 	RBinSection *ptr = NULL;
 	ut64 textsize, datasize, symssize, spszsize, pcszsize;
-	ut64 entry0 = findEntry (arch->buf, 0);
-	ut64 entry1 = findEntry (arch->buf, 1);
-	ut64 entry2 = findEntry (arch->buf, 2);
+	ut64 entry0 = findEntry (bf->buf, 0);
+	ut64 entry1 = findEntry (bf->buf, 1);
+	ut64 entry2 = findEntry (bf->buf, 2);
 
 	if (!(ret = r_list_newf (free))) {
 		return NULL;
 	}
 	// add text segment
-	textsize = r_mem_get_num (arch->buf->buf + 4, 4);
+	ut8 str[4] = {0};
+	r_buf_read_at (bf->buf, 4, str, 4);
+	textsize = r_mem_get_num (str, 4);
 	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
 	}
 	if (!entry1) {
-		entry1 = arch->buf->length;
+		entry1 = r_buf_size (bf->buf);
 	}
-	strncpy (ptr->name, "init", R_BIN_SIZEOF_STRINGS);
-	ptr->size = entry1-entry0;
-	ptr->vsize = entry1-entry0;
+	ptr->name = strdup ("init");
+	ptr->size = entry1 - entry0;
+	ptr->vsize = entry1 - entry0;
 	ptr->paddr = entry0 + 4;
 	ptr->vaddr = entry0;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->add = true;
+	ptr->perm = R_PERM_RX;
 	r_list_append (ret, ptr);
 
 	if (entry1) {
 		if (entry2) {
-			if (!(ptr = R_NEW0 (RBinSection)))
+			if (!(ptr = R_NEW0 (RBinSection))) {
 				return ret;
-			strncpy (ptr->name, "fini", R_BIN_SIZEOF_STRINGS);
-			ptr->size = entry2-entry1;
-			ptr->vsize = entry2-entry1;
+			}
+			ptr->name = strdup ("fini");
+			ptr->size = entry2 - entry1;
+			ptr->vsize = entry2 - entry1;
 			ptr->paddr = entry1 + 4;
 			ptr->vaddr = entry1;
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+			ptr->perm = R_PERM_RX;
+			ptr->add = true;
 			r_list_append (ret, ptr);
 		} else {
 			entry2 = entry1;
 		}
 	}
 	if (entry2) {
-		if (!(ptr = R_NEW0 (RBinSection)))
+		if (!(ptr = R_NEW0 (RBinSection))) {
 			return ret;
-		strncpy (ptr->name, "text", R_BIN_SIZEOF_STRINGS);
-		ptr->size = arch->buf->length - entry2;
-		ptr->vsize = arch->buf->length - entry2;
+		}
+		ptr->name = strdup ("text");
+		ut64 filesize = r_buf_size (bf->buf);
+		ptr->size = filesize - entry2;
+		ptr->vsize = filesize - entry2;
 		ptr->paddr = entry2 + 4;
 		ptr->vaddr = entry2;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+		ptr->perm = R_PERM_RX;
+		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
 	return ret;
 }
 
-static RList* symbols(RBinFile *arch) {
-	// TODO: parse symbol table
-	return NULL;
-}
-
-static RList* imports(RBinFile *arch) {
-	return NULL;
-}
-
-static RList* libs(RBinFile *arch) {
-	return NULL;
-}
-
-static RBinInfo* info(RBinFile *arch) {
+static RBinInfo* info(RBinFile *bf) {
 	RBinInfo *ret = R_NEW0 (RBinInfo);
 	if (ret) {
-		ret->file = strdup (arch->file);
+		ret->file = strdup (bf->file);
 		ret->bclass = strdup ("dna");
 		ret->rclass = strdup ("bcl");
 		ret->os = strdup ("Illumina DNA Sequences");
@@ -175,44 +157,36 @@ static RBinInfo* info(RBinFile *arch) {
 	return ret;
 }
 
-static int size(RBinFile *arch) {
-	ut64 text, data, syms, spsz;
-	int big_endian;
-	if (!arch->o->info) {
-		arch->o->info = info (arch);
+static ut64 size(RBinFile *bf) {
+	if (!bf->o->info) {
+		bf->o->info = info (bf);
 	}
-	big_endian = arch->o->info->big_endian;
+	ut8 str[32] = {0};
+	r_buf_read_at (bf->buf, 0, str, 32);
 	// TODO: reuse section list
-	text = r_mem_get_num (arch->buf->buf + 4, 4);
-	data = r_mem_get_num (arch->buf->buf + 8, 4);
-	syms = r_mem_get_num (arch->buf->buf + 16, 4);
-	spsz = r_mem_get_num (arch->buf->buf + 24, 4);
-	return text+data+syms+spsz+(6*4);
+	ut64 text = r_mem_get_num (str + 4, 4);
+	ut64 data = r_mem_get_num (str + 8, 4);
+	ut64 syms = r_mem_get_num (str + 16, 4);
+	ut64 spsz = r_mem_get_num (str + 24, 4);
+	return text + data + syms + spsz + (6 * 4);
 }
 
 RBinPlugin r_bin_plugin_bcl = {
 	.name = "bcl",
 	.desc = "Base Call DNA Illumina",
 	.license = "BSD",
-	.get_sdb = &get_sdb,
-	.load = &load,
-	.load_bytes = &load_bytes,
+	.load_buffer = &load_buffer,
+	.check_buffer = &__check_buffer,
 	.size = &size,
-	.destroy = &destroy,
-	.check = &check,
-	.check_bytes = &check_bytes,
 	.baddr = &baddr,
 	.binsym = &binsym,
 	.entries = &entries,
 	.sections = &sections,
-	.symbols = &symbols,
-	.imports = &imports,
 	.info = &info,
-	.libs = &libs,
 };
 
 #ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_BIN,
 	.data = &r_bin_plugin_bcl,
 	.version = R2_VERSION

bcl/core_bcl.c

@@ -22,8 +22,8 @@ static int mycall(void *user, const char *input) {
 	int i, j;
 	const int seqsz = 100;
 	int data[seqsz];
-        RCore *core = (RCore *) user;
-        if (!strncmp (input, "pbc", 3)) {
+	RCore *core = (RCore *) user;
+	if (!strncmp (input, "pbc", 3)) {
 		char lala = input[3];
 		int newsize, bsize;
 		int in_color = r_config_get_i (core->config, "scr.color");

blessr2/README.md

@@ -10,16 +10,16 @@ a curses-like library and r2pipe.
 Installation
 ------------
 
-	$ r2pm -i bless-r2
+	$ r2pm -i blessr2
 
 or
 
-	$ npm install -g bless-r2
+	$ npm install -g blessr2
 
 Usage
 -----
 
-	$ $(npm bin)/bless-r2 -h
+	$ $(npm bin)/blessr2 -h
 	Usage: blessr2 [-Htnwd] [file|url]
 
 or from r2

blessr2/index.js

@@ -193,7 +193,9 @@ function newBox(name, obj) {
         obj.selectedBg = '#000070';
         res = blessed.list(obj);
         res.setContent = function(x) {
-            res.setItems(x.split('\n'));
+            if (typeof x === 'string') {
+                res.setItems(x.split('\n'));
+            }
         }
     }
     res.cmd = name;
@@ -230,7 +232,7 @@ function walkInto(r2, foo) {
     box.setText('Loading...\n');
     screen.render();
     [bgbox, box, xbox, gbox].forEach((b) => {
-        r2.cmd(b.cmd, (txt) => {
+        r2.cmd(b.cmd, (err, txt) => {
             b.setContent(txt);
             screen.render();
         });
@@ -343,30 +345,38 @@ function layout(style) {
 function uiNewFrame(r2, cmd, opts) {
     const box = newBox(cmd, opts || {
         width: 80,
-        height: '40%'
+        height: '60%'
     });
-    if (cmd && box.cmd) {
-        r2.cmd(box.cmd, (txt) => {
-            box.setContent(txt);
-            screen.render();
-        });
-    }
     box.setContent('Loading...');
+    if (cmd && box.cmd) {
+        refreshBox (r2, box);
+    }
     box.focus();
     screen.append(box);
     screen.render();
     return box;
 }
 
-function refreshCurrentBox(r2) {
-    const box = screen.focused;
-    if (!box) return;
-    r2.cmd(box.cmd, (txt) => {
+function refreshBox(r2, box) {
+    if (!box || !box.cmd) {
+        return;
+    }
+    r2.cmd(box.cmd, (err, txt) => {
         box.setContent(txt);
         screen.render();
     });
 }
 
+function refreshCurrentBox(r2) {
+    return refreshBox(r2, screen.focused);
+}
+
+function refreshAllBoxes(r2, box) {
+    for (let box of screen.children) {
+        refreshBox(r2, box);
+    }
+}
+
 function keysHelp() {
     return `blessr2 keybindings
 ===================
@@ -506,6 +516,10 @@ function prevWindow() {
     screen.render();
 }
 
+function seekToLine(r2, box) {
+    return activateLine(r2, box);
+}
+
 function activateLine(r2, box) {
     if (box) {
         const item = box.items ? box.items[box.selected] : undefined;
@@ -516,7 +530,7 @@ function activateLine(r2, box) {
             const at = parseInt(line.substring(addr), 16);
             const isCode = true; //item.cmd && item.cmd.indexOf && item.cmd.indexOf('pd') != -1;
             if (isCode) {
-                r2.cmd('e scr.color=0;ao@' + at + ';e scr.color=1', (txt) => {
+                r2.cmd('e scr.color=0;ao@' + at + ';e scr.color=1', (err, txt) => {
                     let obj = {}
                     txt.split('\n').forEach((x) => {
                         const ab = x.split(': ');
@@ -538,22 +552,25 @@ function activateLine(r2, box) {
 }
 
 function stepInto(r2, box) {
-    r2.cmd(config.debug ? 'ds;dr*' : 'aes;.aer*', (cmds) => {
+    r2.cmd(config.debug ? 'ds;dr*' : 'aes;.aer*', (err, cmds) => {
         r2.cmd(cmds.split('\n').join(';'));
         if (!box) box = bgbox;
-        r2.cmd(box.cmd, (txt) => {
+        r2.cmd(box.cmd, (err, txt) => {
             box.setContent(txt);
             screen.render();
-            r2.cmd(bgbox.cmd, (txt) => {
+            r2.cmd(bgbox.cmd, (err, txt) => {
                 bgbox.setContent(txt);
                 screen.render();
+refreshAllBoxes(r2);
             });
+/*
             if (regs !== undefined) {
                 r2.cmd(regs.cmd, (txt) => {
                     regs.setContent(txt);
                     screen.render();
                 });
             }
+*/
         });
     });
     screen.render();
@@ -587,7 +604,7 @@ function gotoOffset(r2, val, box, nostack) {
     if (offsetStack) {
         offsetStack.push(val);
     }
-    r2.cmd('s ' + val + ';' + box.cmd, (txt) => {
+    r2.cmd('s ' + val + ';' + box.cmd, (err, txt) => {
         box.setContent(txt);
         box.setScroll(0);
         box.selected = 0;
@@ -632,9 +649,18 @@ function handleKeys(r2) {
         ['a', () => {
             uiNewFrame(r2, 'af;agf');
         }],
-        ['n', nextWindow],
-        ['S-n', prevWindow],
-        ['s', stepInto],
+        ['n', () => {
+            nextWindow();
+        }],
+        ['tab', () => {
+            nextWindow();
+        }],
+        ['S-n', () => {
+            prevWindow();
+        }],
+        ['s', () => {
+            stepInto(r2, screen.focused);
+        }],
         [';', () => {
             addComment(r2, screen.focused);
         }],
@@ -642,10 +668,10 @@ function handleKeys(r2) {
             uiQuestion('String', 'String to search', (val) => {
                 let box = uiNewFrame(r2, val);
                 box.setContent('Loading...');
-                r2.cmd('/ ' + val, (txt) => {
+                r2.cmd('/ ' + val, (err, txt) => {
                     box.setContent(txt);
                     screen.render();
-                    r2.cmd('fs searches;f', (txt) => {
+                    r2.cmd('fs searches;f', (err, txt) => {
                         box.setContent('Search for: "' + val + '":\n\n' + txt);
                         screen.render();
                     });
@@ -666,7 +692,7 @@ function handleKeys(r2) {
         ['S-a', () => {
             r2.cmd('af', () => {
                 let box = screen.focused;
-                r2.cmd(box.cmd, (txt) => {
+                r2.cmd(box.cmd, (err, txt) => {
                     box.setContent(txt);
                     screen.render();
                 });
@@ -674,7 +700,7 @@ function handleKeys(r2) {
         }],
         [':', () => {
             uiQuestion('Input', 'Command to run', (val) => {
-                r2.cmd(bgbox.cmd = val, (txt) => {
+                r2.cmd(bgbox.cmd = val, (err, txt) => {
                     bgbox.setContent(txt);
                     screen.render();
                 });
@@ -682,11 +708,11 @@ function handleKeys(r2) {
         }],
         ['!', () => {
             uiQuestion('Input', 'Command to run', (val) => {
-                r2.cmd(val, (txt) => {
+                r2.cmd(val, (err, txt) => {
                     uiNewFrame(r2, val);
                     const box = screen.focused;
                     if (box) {
-                        r2.cmd(box.cmd, (x) => {
+                        r2.cmd(box.cmd, (err, x) => {
                             box.setContent(x);
                         });
                     }
@@ -714,6 +740,9 @@ function handleKeys(r2) {
             box.setContent(keysHelp());
             screen.render();
         }],
+        ['S-r', () => {
+            refreshAllBoxes(r2);
+        }],
         ['S-e', () => {
             let ef = uiNewFrame(r2, 'e??', {
                 width: '100%',
@@ -729,7 +758,7 @@ function handleKeys(r2) {
                 screen.render();
             } else {
                 uiQuestion('Eval Config', 'key=value', (val) => {
-                    r2.cmd('e ' + val, (txt) => {
+                    r2.cmd('e ' + val, (err, txt) => {
                         screen.render();
                     });
                 });
@@ -753,7 +782,7 @@ function handleKeys(r2) {
             });
             screen.append(box);
             uiQuestion('Offset', 'Where to go?', (val) => {
-                r2.cmd('s ' + val + ';' + box.cmd, (txt) => {
+                r2.cmd('s ' + val + ';' + box.cmd, (err, txt) => {
                     box.setContent(txt);
                     screen.render();
                 });
@@ -1038,11 +1067,14 @@ function handleMouse(r2) {
     });
 }
 
-function main(r2) {
-    config.theme && r2.cmd("ecr");
-    handleKeys(r2);
-    handleMouse(r2);
-    walkInto(r2, 'entry0');
+function main(err, r2) {
+  if (err) {
+    throw err;
+  }
+  config.theme && r2.cmd("ecr");
+  handleKeys(r2);
+  handleMouse(r2);
+  walkInto(r2, 'entry0');
 }
 
 /* main */

blessr2/package.json

@@ -1,11 +1,11 @@
 {
   "name": "blessr2",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "bless-based ui for radare2",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/radare/radare2-bindings.git"
+    "url": "https://github.com/radareorg/radare2-bindings.git"
   },
   "keywords": [
     "radare",
@@ -24,7 +24,7 @@
   },
   "license": "LGPL-3.0",
   "bugs": {
-    "url": "https://github.com/radare/radare2-extras/issues"
+    "url": "https://github.com/radareorg/radare2-extras/issues"
   },
   "homepage": "http://www.radare.org",
   "devDependencies": {

checkm8/README.md

@@ -0,0 +1,11 @@
+This is the r2 plugin to read/write memory using the checkm8 exploit.
+
+1. Clone https://github.com/axi0mX/ipwndfu
+2. Copy this file into the root directory of this repository
+3. r2 -I r2io.py ipwndfu://
+4. enjoy
+
+NOTES
+
+* This is very unstable, reading on unallocated regions results in device reboot
+* Requires python3 .. so maybe better use @geohot's fork

checkm8/r2io.py

@@ -0,0 +1,65 @@
+# iOS pwndfu checkm8 io plugin for radare2
+# ========================================
+#
+#  -- pancake @ nopcode.org
+#
+# Usage:
+#   r2 -I test-py-io.py pwndfu://
+#
+# The r2lang.plugin function exposes a way to register new plugins
+# into the RCore instance. This API is only available from RLang.
+# You must call with with '#!python test.py' or 'r2 -i test.py ..'
+
+import r2lang
+from dfuexec import *
+
+FAKESIZE = 512
+
+device = None
+
+def pyio(a):
+	def _open(path, rw, perm):
+		global device
+		device = dfu.acquire_device()
+		serial_number = device.serial_number
+		dfu.release_device(device)
+		device = PwnedDFUDevice()
+		print("MyPyIO Opening %s"%(path))
+		return 1234 
+	def _check(path, many):
+		print("python-check %s"%(path))
+		return path[0:9] == "pwndfu://"
+	def _read(offset, length):
+		global device
+		res = device.read_memory(address, length)
+		print("python-read")
+		return res
+	def _seek(offset, whence):
+		print("python-seek")
+		if whence == 0: # SET
+			return offset
+		if whence == 1: # CUR
+			return offset
+		if whence == 2: # END
+			return ROM_SIZE
+		return ROM_SIZE
+	def _write(offset, data, length):
+		print("TODO: python-write")
+		return True
+	def _system(cmd):
+		print("pwndfu://%s"%(cmd))
+		return True
+	return {
+		"name": "pwndfu",
+		"license": "GPL",
+		"desc": "pwndfu IO plugin (pwndfu://3)",
+		"check": _check,
+		"open": _open,
+		"read": _read,
+		"seek": _seek,
+		"write": _write,
+		"system": _system,
+	}
+
+print("Registering Python IO plugin...")
+print(r2lang.plugin("io", pyio))

configure

@@ -1,9 +1,10 @@
 #!/bin/sh
-# This script was automatically generated by ACR v0.10.2
+# This script was automatically generated by ACR v2.2.4
 # @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... "
@@ -25,7 +26,7 @@ while : ; do
 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 {
@@ -40,8 +41,13 @@ shift
 done
 }
 
+QUIET=0
+be_quiet() {
+	QUIET=1
+}
+
 VPATH=`dirname ${0}`
-if [ "${VPATH}" = "." ]; then 
+if [ "${VPATH}" = "." ]; then
 	WODIS=current
 else
 	if [ "${VPATH}" = "${PWD}" ]; then
@@ -61,12 +67,27 @@ if [ -e "${VPATH}/config.guess" ]; then
 	sh ${VPATH}/config.guess
 	return
 fi
-CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
+CPU="`uname -m | tr 'A-Z' 'a-z' | sed -e 's, ,,g' | cut -d - -f 1`"
 OS="`uname -s|tr A-Z a-z`"
+uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
 GNU="`uname --help 2>&1 | grep gnu`"
 [ "${GNU}" ] && OS="${OS}-gnu"
-[ "${CPU}" = ppc ] && CPU="powerpc"
-echo "${CPU}-unknown-${OS}"
+# normalize CPU
+case "${CPU}" in
+	ppc*|powermac*|powermacintosh*|powerpc*)
+		if echo "${CPU}" | grep -q '64'; then
+			CPU=powerpc64
+		else
+			CPU=powerpc
+		fi
+		;;
+	*) ;;
+esac
+VENDOR="unknown"
+if [ "${OS}" = "darwin" ]; then
+	VENDOR=apple
+fi
+echo "${CPU}-${VENDOR}-${OS}"
 }
 
 SEARCHPATH="/usr /usr/local /usr/pkg /sw"
@@ -76,24 +97,29 @@ CROSSBUILD=0
 BUILD=`guess_os`
 HOST="${BUILD}"
 TARGET="${HOST}"
+ETCDIR="/etc"
 SYSCONFDIR=""
+DESCRIPTION=""
 
 create_environ() {
 : ${EPREFIX:="${PREFIX}"}
 : ${SPREFIX:="${PREFIX}"}
 : ${BINDIR:="${SPREFIX}/bin"}
 : ${SBINDIR:="${PREFIX}/sbin"}
-: ${SYSCONFDIR:="${SPREFIX}/etc"}
+: ${ETCDIR:="${SPREFIX}/etc"}
 : ${LIBDIR:="${SPREFIX}/lib"}
+: ${PKGCFG_LIBDIR:='${exec_prefix}/lib'}
+: ${PKGCFG_INCDIR:='${prefix}/include'}
 : ${LIBEXECDIR:="${SPREFIX}/libexec"}
 : ${INCLUDEDIR:="${SPREFIX}/include"}
 : ${DATADIR:="${SPREFIX}/share"}
 : ${INFODIR:="${DATADIR}/info"}
 : ${MANDIR:="${DATADIR}/man"}
+: ${DOCDIR:="${DATADIR}/doc/radare2-extras"}
 : ${LOCALSTATEDIR:="${SPREFIX}/var"}
 for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do
-  [ -e $A/ginstall ] && : ${INSTALL:=$A/ginstall} && break
-  [ -e $A/install ] && : ${INSTALL:=$A/install} && break
+  [ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break
+  [ -e "$A"/install ] && : ${INSTALL:="$A"/install} && break
 done
 : ${INSTALL_DIR:=${INSTALL} -d}
 : ${INSTALL_DATA:=${INSTALL} -m 644}
@@ -102,12 +128,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='radare2-extras' ; VERSION='0.10.4' ; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+ PKGNAME='radare2-extras' ; VERSION='6.0.0' ; VERSION_MAJOR=6; VERSION_MINOR=0; VERSION_PATCH=0; VERSION_NUMBER=60000; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
 }
-                
+
 show_usage() {
 cat <<EOF2
-'configure' configures radare2-extras-0.10.4 to adapt to many kinds of systems.
+'configure' configures radare2-extras-6.0.0 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -118,27 +144,30 @@ Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              display this help and exit
-  -V, --version           display version information and exit
   -r, --report            show what libs/programs require to work
+  -q, --quiet             be quiet, less verbose (see ./configure -qV)
+  -V, --version           display version information and exit
 
 Installation directories:
-  --prefix=PREFIX        install arch-independent files in PREFIX [/usr/local]
   --exec-prefix=EPREFIX  install arch-dependent files in EPREFIX [PREFIX]
+  --prefix=PREFIX        install arch-independent files in PREFIX [/usr/local]
   --sandbox=SPREFIX      sandbox prefix directory: SPREFIX [PREFIX]
 
 Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --libpath=DIR          set rpath/libname-path to linker
+  --docdir=DIR           documentation directory [DATADIR/doc/radare2-extras]
   --includedir=DIR       C header files [PREFIX/include]
   --infodir=DIR          info documentation [DATADIR/info]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --libpath=DIR          set rpath/libname-path to linker
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --mandir=DIR           man documentation [DATADIR/man]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --etcdir=DIR           same as --sysconfdir (/etc)
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
 
 System types:
   --build=BUILD          configure for building on BUILD [guessed]
@@ -148,14 +177,13 @@ EOF2
 
 printf "
 Optional Features:
-  --with-ostype          Choose OS type ( gnulinux windows darwin haiku )  (USEROSTYPE=auto)
-  --without-ewf          build without libewf 
+  --with-ostype          Choose OS type ( gnulinux windows darwin haiku ) (USEROSTYPE=auto)
+  --without-ewf          build without libewf
 "
 printf "
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
-  CPPFLAGS    C preprocessor flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
@@ -175,8 +203,22 @@ take_environ() {
 : ${PREFIX:=/usr/local/}
 }
 
+ochof() {
+	[ "$QUIET" = 1 ] && return
+	printf "$*"
+}
+
+ocho() {
+	[ "$QUIET" = 1 ] && return
+	echo "$*"
+}
+
 show_version() {
-echo "radare2-extras-0.10.4 configuration script done with acr v0.10.2.
+if [ "$QUIET" = 1 ]; then
+	echo "6.0.0"
+	exit 0
+fi
+echo "radare2-extras-6.0.0 configuration script done with acr v2.2.4.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -184,7 +226,7 @@ exit 0
 
 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
@@ -196,18 +238,25 @@ fi
 case $flag in
 -h|--help|--hel|--h|--he|-help)
 	show_usage ; ;;
+-qV|-quiet-version|--quiet-version)
+	be_quiet
+	show_version ; ;;
+-q|-quiet|--quiet)
+	be_quiet ; ;;
 -V|-version|--version)
 	show_version ; ;;
 -r|--r|--report)
-echo "PKGNAME:   radare2-extras"
-echo "VERSION:   0.10.4"
-echo "LANGS:     c"
-echo "OPTIONAL:  libewf"
-echo "PKG-CONFIG:  r_core libewf unicorn yara"
-echo "FLAGS:     --with-ostype=auto --without-ewf"
+echo "PKGNAME:     radare2-extras"
+echo "VERSION:     6.0.0"
+echo "AUTHOR:      pancake"
+echo "EMAIL:       [email protected]"
+echo "LANGS:       c"
+echo "OPTIONAL:    libewf libyara"
+echo "PKGCONFIG:   r_core libewf unicorn yara"
+echo "FLAGS:       --with-ostype=auto --without-ewf"
 	exit 0
 	;;
---cache-file) 
+--cache-file)
 	# ignored: acr have no cache
 	;;
 --build)
@@ -229,19 +278,27 @@ echo "FLAGS:     --with-ostype=auto --without-ewf"
 	SBINDIR="$value"; ;;
 --libexecdir)
 	LIBEXECDIR="$value"; ;;
+--docdir)
+	DOCDIR="$value"; ;;
 --datadir)
 	DATADIR="$value"; ;;
 --sysconfdir)
-	SYSCONFDIR="$value"; ;;
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
+--etcdir)
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
 --sharedstatedir)
 	SHAREDSTATEDIR="$value"; ;;
 --localstatedir)
 	LOCALSTATEDIR="$value"; ;;
 --libdir)
-	LIBDIR="$value"; ;;
+	LIBDIR="$value"
+	PKGCFG_LIBDIR="$value"; ;;
 --libpath)
 	LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;;
 --includedir)
+	PKGCFG_INCDIR="$value"
 	INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
 --infodir)
 	INFODIR="$value"; ;;
@@ -250,7 +307,7 @@ echo "FLAGS:     --with-ostype=auto --without-ewf"
 
 --with-ostype) if [ -z "${value}" ]; then USEROSTYPE="auto"; else USEROSTYPE="${value}" ; fi ;;
 "--without-ewf") WANT_EWF="0"; ;;
-*) if [ "$value" ]; then eval "`echo $flag2=$value`" ; 
+*) if [ "$value" ]; then eval "`echo $flag2=$value`" ;
 else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;;
 esac
 }
@@ -267,48 +324,80 @@ parse_options "$1"
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR 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 R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE USEROSTYPE HAVE_LIB_EWF EWF_CFLAGS EWF_LDFLAGS HAVE_PKGCFG_LIBEWF WANT_EWF UC_CFLAGS UC_LDFLAGS HAVE_PKGCFG_UNICORN HAVE_LIB_YARA YARA_CFLAGS YARA_LDFLAGS HAVE_PKGCFG_YARA"
+ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR 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 VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL PKGCONFIG CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE USEROSTYPE HAVE_LIB_EWF EWF_CFLAGS EWF_LDFLAGS HAVE_PKGCFG_LIBEWF WANT_EWF UC_CFLAGS UC_LDFLAGS HAVE_PKGCFG_UNICORN HAVE_LIB_YARA YARA_CFLAGS YARA_LDFLAGS HAVE_PKGCFG_YARA"
 
 create_environ
 
-echo "checking build system type... ${BUILD}"
-echo "checking host system type... ${HOST}"
-echo "checking target system type... ${TARGET}"
+ocho "checking build system type... ${BUILD}"
+ocho "checking host system type... ${HOST}"
+ocho "checking target system type... ${TARGET}"
 [ "${CROSSBUILD}" = 1 ] && echo "using crosscompilation mode."
 
 #split_host BUILD HOST TARGET
 [ -n "${prefix}" ] && PREFIX="${prefix}"
-echo "checking for working directories... ${WODIS}"
-echo "using prefix '${PREFIX}'"
+ocho "checking for working directories... ${WODIS}"
+ocho "using prefix '${PREFIX}'"
 ACR_RMFILES=" test.c a.out a.exe"
 
-: 
+ochof "checking for pkg-config... "
+ENVWORDS="${ENVWORDS} HAVE_PKGCONFIG"
+if [ -n "$PKGCONFIG" ]; then
+	if [ -x "$PKGCONFIG" ]; then
+		_HAVE_PKGCONFIG="${PKGCONFIG}"
+	else
+		ocho "PKGCONFIG env is not executable"
+		PKGCONFIG=""
+	fi
+else
+	IFS=:
+	for A in ${PATH} ; do
+		if [ -x "${A}/pkg-config" ]; then
+			PKGCONFIG="${A}/pkg-config"
+		elif [ -x "${A}/pkgconf" ]; then
+			PKGCONFIG="${A}/pkgconf"
+		else
+			continue
+		fi
+		break
+	done
+	unset IFS
+fi
+if [ -n "${PKGCONFIG}" ]; then
+	ocho ${PKGCONFIG}
+	HAVE_PKGCONFIG=1
+else
+	HAVE_PKGCONFIG=0
+	echo "Cannot find pkg-config or pkgconf in PATH" >&2
+	exit 1
+ocho no; fi
 COMPILER=CC
-printf "checking for c compiler... "
+ochof "checking for c compiler... "
 HAVE_LANG_C=1
 if [ "${CROSSBUILD}" = 1 ]; then
  (command -v ${HOST}-${CC} >/dev/null 2>&1)
  if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
 fi
 echo "int main(int argc, char **argv){return 0;}" > test.c
- (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
+ (exec ${CC} -o a.out ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
 if [ $? = 0 ]; then echo ${CC}; else
  echo no ; HAVE_LANG_C=0
 do_remove
 echo "ERROR: ${CC} cannot create executables" >&2 ;
 exit 1 ; fi
-[ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
+type ${PKGCONFIG} > /dev/null 2>&1 || echo "ERROR: Cannot find valid PKGCONFIG, pkg-config or pkgconf in PATH"
 echo 'Using PKGCONFIG: '${PKGCONFIG}
 printf 'checking pkg-config flags for r_core... '
 tmp=`${PKGCONFIG} --cflags r_core 2>/dev/null`
-if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_R_CORE=0; 
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_R_CORE=0;
+R2_CFLAGS='';R2_LDFLAGS='';
 echo 'This package is required'
 exit 1
-else 
-R2_CFLAGS=$tmp; 
+else
+R2_CFLAGS=$tmp;
 tmp=`${PKGCONFIG} --libs r_core 2>/dev/null`
-if [ $? = 0 ]; then 
-echo yes; HAVE_PKGCFG_R_CORE=1; 
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_R_CORE=1;
 R2_LDFLAGS=$tmp; fi; fi
 check_library() {
 VAR=$1
@@ -316,7 +405,7 @@ S="$"
 _REQUIRED=$3
 _CHKLIB_NAME=$2
 _CHKLIB_LIBS=$(echo "-l${_CHKLIB_NAME}" | sed 's,+, -l,g')
-printf "checking for lib${_CHKLIB_NAME} ... "
+ochof "checking for lib${_CHKLIB_NAME} ... "
 echo "int main(int ac, char **av){return 0;}" > test.c
 eval ${S}${COMPILER} ${CFLAGS} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${_CHKLIB_LIBS} test.c >/dev/null 2>&1
 if [ $? = 0 ]; then
@@ -324,18 +413,26 @@ if [ $? = 0 ]; then
 	echo yes
 else
 	eval ${VAR}=0
-	echo no  ; fi }
-check_library HAVE_LIB_EWF ewf 0 
-[ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
-echo 'Using PKGCONFIG: '${PKGCONFIG}
+	echo no
+	if [ "${_REQUIRED}" = 1 ]; then
+	  echo "this library is required."
+	  do_remove
+	  exit 1
+	fi
+fi
+}
+
+check_library HAVE_LIB_EWF ewf 0
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
 printf 'checking pkg-config flags for libewf... '
 tmp=`${PKGCONFIG} --cflags libewf 2>/dev/null`
-if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_LIBEWF=0; 
-else 
-EWF_CFLAGS=$tmp; 
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_LIBEWF=0;
+EWF_CFLAGS='';EWF_LDFLAGS='';
+else
+EWF_CFLAGS=$tmp;
 tmp=`${PKGCONFIG} --libs libewf 2>/dev/null`
-if [ $? = 0 ]; then 
-echo yes; HAVE_PKGCFG_LIBEWF=1; 
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_LIBEWF=1;
 EWF_LDFLAGS=$tmp; fi; fi
 if [ "$HAVE_PKGCFG_LIBEWF" = "1" ]; then
 HAVE_LIB_EWF="1"
@@ -343,36 +440,43 @@ else
 HAVE_LIB_EWF="0"; fi
 if [ "$WANT_EWF" = "0" ]; then
 HAVE_LIB_EWF="0"; fi
-[ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
-echo 'Using PKGCONFIG: '${PKGCONFIG}
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
 printf 'checking pkg-config flags for unicorn... '
 tmp=`${PKGCONFIG} --cflags unicorn 2>/dev/null`
-if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_UNICORN=0; 
-else 
-UC_CFLAGS=$tmp; 
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_UNICORN=0;
+UC_CFLAGS='';UC_LDFLAGS='';
+else
+UC_CFLAGS=$tmp;
 tmp=`${PKGCONFIG} --libs unicorn 2>/dev/null`
-if [ $? = 0 ]; then 
-echo yes; HAVE_PKGCFG_UNICORN=1; 
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_UNICORN=1;
 UC_LDFLAGS=$tmp; fi; fi
-check_library HAVE_LIB_YARA yara 0 
-[ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
-echo 'Using PKGCONFIG: '${PKGCONFIG}
+check_library HAVE_LIB_YARA yara 0
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
 printf 'checking pkg-config flags for yara... '
 tmp=`${PKGCONFIG} --cflags yara 2>/dev/null`
-if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_YARA=0; 
-else 
-YARA_CFLAGS=$tmp; 
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_YARA=0;
+YARA_CFLAGS='';YARA_LDFLAGS='';
+else
+YARA_CFLAGS=$tmp;
 tmp=`${PKGCONFIG} --libs yara 2>/dev/null`
-if [ $? = 0 ]; then 
-echo yes; HAVE_PKGCFG_YARA=1; 
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_YARA=1;
 YARA_LDFLAGS=$tmp; fi; fi
 SEDFLAGS=" -e '"
 COUNT=0
 for A in ${ENVWORDS} ; do
 	[ "${A}" = VPATH ] && continue
-	[ "${A}" = srcdir ] && continue 
+	[ "${A}" = srcdir ] && continue
 	eval "VAR=\$${A}"
-	VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+	case "" in
+	mingw*|cygwin*|msys*)
+		VAR="`echo ${VAR} | sed -e 's/\\/\\\\/g' -e 's/\,/\\\,/g'`"
+		;;
+	*)
+		VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+		;;
+	esac
 	[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
 	COUNT=$(($COUNT+1))
 	SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
@@ -390,8 +494,8 @@ if [ -f "${VPATH}/${A}.acr" ]; then
    exit 1
   fi
  fi
- echo "creating ${SD_TARGET}"
-mkdir -p $(echo ${A} | sed -e "s,/`basename ${A}`$,,g")
+ ocho "creating ${SD_TARGET}"
+[ "${VPATH}" != '.' ] &&  mkdir -p $(echo ${A} | sed -e "s,/`basename ${A}`$,,g")
  cat ${VPATH}/${SD_TARGET}.acr | \
 eval sed -e "s,@VPATH@,${VPATH}/${A},g" ${SEDFLAGS} > ${SD_TARGET}.tmp
 
@@ -401,7 +505,7 @@ if [ "$VALUE" = 0 ]; then ## FALSE
  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
@@ -410,10 +514,12 @@ done
 done
 
 do_remove
+if [ "$QUIET" = 0 ]; then
 echo
 echo "Final report:"
-for A in  PREFIX ; do # REPORT
+for A in  PREFIX ; do
 eval VAL="\$${A}"
-[ -z "${VAL}" ] && VAL="(null)"
+[ -z "${VAL}" ] && VAL="\"\""
 echo " - ${A} = ${VAL}"
 done
+fi

configure.acr

@@ -1,7 +1,9 @@
 PKGNAME radare2-extras
-VERSION 0.10.4
+VERSION 6.0.0
 CONTACT pancake ; [email protected]
 
+USE_PKGCONFIG!
+
 REPORT PREFIX ;
 
 LANG_C!

crashlog/r2crash.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+if (process.argv.length > 2) {
+  walkTheLines(process.argv[2]);
+} else {
+  console.error('Usage: r2crash.js [crashlog]');
+  process.exit(1);
+}
+
+function walkTheLines(file) {
+  const lines = fs.readFileSync(file).toString().split('\n');
+  lines.forEach(walkLine);
+}
+
+// global state is bad
+var threadId = 0;
+var mode = '';
+
+function walkLine(line) {
+  switch (mode) {
+  case 'thread-state':
+    mode = parseThreadState(line);
+    break;
+  default:
+    if (line.startsWith('Crashed Thread')) {
+      const threadId = +line.substring(20).trim().split(/ /)[0];
+      console.error("# tid", threadId);
+    }
+    break;
+  }
+  if (line.startsWith('Thread ') && line.indexOf('Thread State') !== -1) {
+    mode = 'thread-state';
+  }
+}
+
+function parseThreadState(line) {
+  if (line.trim() === '') {
+    return '';
+  }
+  const regpairs = line.replace(/: /g,':').replace(/\ \ */g,' ').trim().split(/ /);
+  for (let rp of regpairs) {
+    const rv = rp.split(':');
+    console.log('ar', rv[0], '=', rv[1]);
+  }
+  return 'thread-state';
+}

crashlog/twitter.log

@@ -0,0 +1,613 @@
+Process:               Twitter [46000]
+Path:                  /Applications/Twitter.app/Contents/MacOS/Twitter
+Identifier:            com.twitter.twitter-mac
+Version:               4.3.2 (5002734)
+App Item ID:           409789998
+App External ID:       821012958
+Code Type:             X86-64 (Native)
+Parent Process:        ??? [1]
+Responsible:           Twitter [46000]
+User ID:               501
+
+Date/Time:             2018-01-28 19:26:40.932 +0100
+OS Version:            Mac OS X 10.13.2 (17C88)
+Report Version:        12
+Anonymous UUID:        824E4619-C89D-460F-CA58-EEDCCDFC4890
+
+Sleep/Wake UUID:       312CC193-CFF9-445F-BFE8-FB4128F12753
+
+Time Awake Since Boot: 230000 seconds
+Time Since Wake:       2100 seconds
+
+System Integrity Protection: disabled
+
+Crashed Thread:        0  Dispatch queue: com.apple.main-thread
+
+Exception Type:        EXC_BAD_INSTRUCTION (SIGILL)
+Exception Codes:       0x0000000000000001, 0x0000000000000000
+Exception Note:        EXC_CORPSE_NOTIFY
+
+Termination Signal:    Illegal instruction: 4
+Termination Reason:    Namespace SIGNAL, Code 0x4
+Terminating Process:   exc handler [0]
+
+Application Specific Information:
+Crashing on exception: NSConcreteMutableAttributedString initWithString:: nil value
+
+Application Specific Backtrace 1:
+0   CoreFoundation                      0x00007fff2dbd100b __exceptionPreprocess + 171
+1   libobjc.A.dylib                     0x00007fff547afc76 objc_exception_throw + 48
+2   CoreFoundation                      0x00007fff2dc62c9d +[NSException raise:format:] + 205
+3   Foundation                          0x00007fff2fc4d9c8 -[NSConcreteMutableAttributedString initWithString:] + 129
+4   Twitter                             0x000000010f70d3d6 Twitter + 431062
+5   Twitter                             0x000000010f70c564 Twitter + 427364
+6   AppKit                              0x00007fff2b9d87c8 _NSViewLayout + 587
+7   AppKit                              0x00007fff2b1d3323 -[NSView _layoutSubtreeWithOldSize:] + 437
+8   AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+9   AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+10  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+11  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+12  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+13  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+14  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+15  AppKit                              0x00007fff2b1d359c -[NSView _layoutSubtreeWithOldSize:] + 1070
+16  AppKit                              0x00007fff2b9df524 -[NSView _layoutSubtreeIfNeededAndAllowTemporaryEngine:] + 1380
+17  AppKit                              0x00007fff2b26e480 -[NSView _sendViewWillDrawInRect:clipRootView:] + 47
+18  AppKit                              0x00007fff2b26d301 -[NSView displayIfNeeded] + 1142
+19  AppKit                              0x00007fff2b3cfbb1 -[NSProgressIndicator startAnimation:] + 246
+20  AppKit                              0x00007fff2b3cfce1 -[NSProgressIndicator viewDidUnhide] + 169
+21  AppKit                              0x00007fff2b1ebc59 -[NSView _recursiveLostHiddenAncestor] + 127
+i2  AppKit                              0x00007fff2b1ebd0e -[NSView _recursiveLostHiddenAncestor] + 308
+23  AppKit                              0x00007fff2b1ebd0e -[NSView _recursiveLostHiddenAncestor] + 308
+24  AppKit                              0x00007fff2b164aa1 -[NSView(NSInternal) _setHidden:setNeedsDisplay:] + 326
+25  AppKit                              0x00007fff2b2c9b6c -[NSView prepareForReuse] + 55
+26  AppKit                              0x00007fff2b30ac0c -[NSTableRowView prepareForReuse] + 70
+27  Foundation                          0x00007fff2fc5f33a -[NSISEngine withBehaviors:performModifications:] + 131
+28  AppKit                              0x00007fff2b10e5a1 -[NSView(NSConstraintBasedLayout) _withAutomaticEngineOptimizationDisabled:] + 70
+29  AppKit                              0x00007fff2b300236 -[NSTableRowData _prepareViewForReuse:] + 81
+30  AppKit                              0x00007fff2b231fd1 -[NSTableRowData makeViewWithIdentifier:owner:] + 312
+31  AppKit                              0x00007fff2b231e70 -[NSTableView makeViewWithIdentifier:owner:] + 58
+32  Twitter                             0x000000010f891959 Twitter + 2021721
+33  Twitter                             0x000000010f835012 Twitter + 1642514
+34  AppKit                              0x00007fff2b2ba8da -[NSTableView(NSTableViewViewBased) _delegateRowViewForRow:] + 64
+35  AppKit                              0x00007fff2b2313e9 -[NSTableView(NSTableViewViewBased) makeRowViewForRow:] + 121
+36  AppKit                              0x00007fff2bb1e59e -[NSTableRowData _preparedRowViewForRow:storageHandler:] + 118
+37  AppKit                              0x00007fff2b2312e5 -[NSTableRowData _addRowViewForVisibleRow:withPriorView:] + 392
+38  AppKit                              0x00007fff2b2310a8 -[NSTableRowData _addRowViewForVisibleRow:withPriorRowIndex:inDictionary:withRowAnimation:] + 416
+39  AppKit                              0x00007fff2bb20741 -[NSTableRowData _updateVisibleRowEntries] + 1720
+40  AppKit                              0x00007fff2b22fda6 -[NSTableRowData updateVisibleRowViews] + 294
+41  AppKit                              0x00007fff2b3d924e -[NSTableRowData prepareContentInRect:] + 106
+42  AppKit                              0x00007fff2b3d8d46 -[NSTableView prepareContentInRect:] + 303
+43  AppKit                              0x00007fff2b9d9519 -[NSView _updateSuggestedContentRectToValue:] + 616
+44  AppKit                              0x00007fff2b32268c -[NSView _updateSuggestedContentRect] + 100
+45  AppKit                              0x00007fff2b36c40e -[NSView _updateSuggestedContentRectForVisibleRectChange] + 219
+46  AppKit                              0x00007fff2b24478b -[NSScrollView(NSRulerSupport) _handleBoundsChangeForSubview:] + 364
+47  AppKit                              0x00007fff2b206ca7 -[NSView _postBoundsChangeNotification] + 60
+48  AppKit                              0x00007fff2b206c00 -[NSView translateOriginToPoint:] + 261
+49  AppKit                              0x00007fff2b20679b -[NSClipView _immediateScrollToPoint:] + 536
+50  AppKit                              0x00007fff2b2064bf -[NSClipView scrollToPoint:] + 232
+51  AppKit                              0x00007fff2b241f8f -[NSScrollView scrollClipView:toPoint:] + 75
+52  AppKit                              0x00007fff2b1ecd49 -[NSClipView _scrollTo:animateScroll:flashScrollerKnobs:] + 1273
+53  AppKit                              0x00007fff2b40d149 -[NSScrollView _doScroller:hitPart:multiplier:] + 1323
+54  AppKit                              0x00007fff2b8c575a -[NSApplication(NSResponder) sendAction:to:from:] + 312
+55  AppKit                              0x00007fff2b36b933 -[NSControl sendAction:to:] + 86
+56  AppKit                              0x00007fff2b40cb80 -[NSScroller sendAction:to:] + 91
+57  AppKit                              0x00007fff2b40c995 -[NSScroller(NSScrollerPrivate) _scrollByDelta:] + 842
+58  AppKit                              0x00007fff2b40bd4b -[NSScrollingBehaviorLegacy _scrollView:smoothScrollWithEvent:] + 2746
+59  AppKit                              0x00007fff2b40ae16 -[NSScrollingBehaviorLegacy scrollView:scrollWheelWithEvent:] + 1177
+60  Twitter                             0x000000010f7c7e59 Twitter + 1195609
+61  AppKit                              0x00007fff2b40eee5 __71-[NSScrollingBehaviorLegacy _latchAcceleratedScrollEventsToScrollView:]_block_invoke + 282
+62  AppKit                              0x00007fff2b298366 _NSSendEventToObservers + 337
+63  AppKit                              0x00007fff2b8c152a -[NSApplication(NSEvent) sendEvent:] + 70
+64  AppKit                              0x00007fff2b122d9d -[NSApplication run] + 812
+65  AppKit                              0x00007fff2b0f1f1a NSApplicationMain + 804
+66  libdyld.dylib                       0x00007fff5539f115 start + 1
+67  ???                                 0x0000000000000001 0x0 + 1
+
+Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
+0   com.apple.AppKit              	0x00007fff2b458794 -[NSApplication _crashOnException:] + 109
+1   com.apple.AppKit              	0x00007fff2b45867c -[NSApplication reportException:] + 953
+2   com.twitter.twitter-mac       	0x000000010f9205fd 0x10f6a4000 + 2606589
+3   com.apple.AppKit              	0x00007fff2b122e2e -[NSApplication run] + 957
+4   com.apple.AppKit              	0x00007fff2b0f1f1a NSApplicationMain + 804
+5   libdyld.dylib                 	0x00007fff5539f115 start + 1
+
+Thread 1:: com.twitter.crashlytics.mac.MachExceptionServer
+0   libsystem_kernel.dylib        	0x00007fff554f09d2 write + 10
+1   com.twitter.twitter-mac       	0x000000010f91f68a 0x10f6a4000 + 2602634
+2   com.twitter.twitter-mac       	0x000000010f90ea54 0x10f6a4000 + 2533972
+3   libsystem_pthread.dylib       	0x00007fff5562a6c1 _pthread_body + 340
+4   libsystem_pthread.dylib       	0x00007fff5562a56d _pthread_start + 377
+5   libsystem_pthread.dylib       	0x00007fff55629c5d thread_start + 13
+
+Thread 2:: com.apple.NSEventThread
+0   libsystem_kernel.dylib        	0x00007fff554e57c2 mach_msg_trap + 10
+1   libsystem_kernel.dylib        	0x00007fff554e4cdc mach_msg + 60
+2   com.apple.CoreFoundation      	0x00007fff2db4c355 __CFRunLoopServiceMachPort + 341
+3   com.apple.CoreFoundation      	0x00007fff2db4b6a7 __CFRunLoopRun + 1783
+4   com.apple.CoreFoundation      	0x00007fff2db4ad23 CFRunLoopRunSpecific + 483
+5   com.apple.AppKit              	0x00007fff2b26b3c8 _NSEventThread + 184
+6   libsystem_pthread.dylib       	0x00007fff5562a6c1 _pthread_body + 340
+7   libsystem_pthread.dylib       	0x00007fff5562a56d _pthread_start + 377
+8   libsystem_pthread.dylib       	0x00007fff55629c5d thread_start + 13
+
+Thread 3:: com.apple.NSURLConnectionLoader
+0   libsystem_kernel.dylib        	0x00007fff554e57c2 mach_msg_trap + 10
+1   libsystem_kernel.dylib        	0x00007fff554e4cdc mach_msg + 60
+2   com.apple.CoreFoundation      	0x00007fff2db4c355 __CFRunLoopServiceMachPort + 341
+3   com.apple.CoreFoundation      	0x00007fff2db4b6a7 __CFRunLoopRun + 1783
+4   com.apple.CoreFoundation      	0x00007fff2db4ad23 CFRunLoopRunSpecific + 483
+5   com.apple.CFNetwork           	0x00007fff2ccc3f84 -[__CoreSchedulingSetRunnable runForever] + 722
+6   com.apple.Foundation          	0x00007fff2fc38e48 __NSThread__start__ + 1197
+7   libsystem_pthread.dylib       	0x00007fff5562a6c1 _pthread_body + 340
+8   libsystem_pthread.dylib       	0x00007fff5562a56d _pthread_start + 377
+9   libsystem_pthread.dylib       	0x00007fff55629c5d thread_start + 13
+
+Thread 4:: com.apple.coreaudio.AQClient
+0   libsystem_kernel.dylib        	0x00007fff554e57c2 mach_msg_trap + 10
+1   libsystem_kernel.dylib        	0x00007fff554e4cdc mach_msg + 60
+2   com.apple.CoreFoundation      	0x00007fff2db4c355 __CFRunLoopServiceMachPort + 341
+3   com.apple.CoreFoundation      	0x00007fff2db4b6a7 __CFRunLoopRun + 1783
+4   com.apple.CoreFoundation      	0x00007fff2db4ad23 CFRunLoopRunSpecific + 483
+5   com.apple.audio.toolbox.AudioToolbox	0x00007fff2c4f61aa GenericRunLoopThread::Entry(void*) + 158
+6   com.apple.audio.toolbox.AudioToolbox	0x00007fff2c4f5eb9 CAPThread::Entry(CAPThread*) + 77
+7   libsystem_pthread.dylib       	0x00007fff5562a6c1 _pthread_body + 340
+8   libsystem_pthread.dylib       	0x00007fff5562a56d _pthread_start + 377
+9   libsystem_pthread.dylib       	0x00007fff55629c5d thread_start + 13
+
+Thread 5:
+0   libsystem_kernel.dylib        	0x00007fff554ef562 __workq_kernreturn + 10
+1   libsystem_pthread.dylib       	0x00007fff5562a06a _pthread_wqthread + 1035
+2   libsystem_pthread.dylib       	0x00007fff55629c4d start_wqthread + 13
+
+Thread 6:
+0   libsystem_kernel.dylib        	0x00007fff554ef562 __workq_kernreturn + 10
+1   libsystem_pthread.dylib       	0x00007fff5562a26f _pthread_wqthread + 1552
+2   libsystem_pthread.dylib       	0x00007fff55629c4d start_wqthread + 13
+
+Thread 7:
+0   libsystem_kernel.dylib        	0x00007fff554ef562 __workq_kernreturn + 10
+1   libsystem_pthread.dylib       	0x00007fff5562a06a _pthread_wqthread + 1035
+2   libsystem_pthread.dylib       	0x00007fff55629c4d start_wqthread + 13
+
+Thread 8:: Dispatch queue: com.apple.CFNetwork.Connection
+0   libsystem_blocks.dylib        	0x00007fff553ed991 _Block_release + 99
+1   libdispatch.dylib             	0x00007fff55365d50 _dispatch_client_callout + 8
+2   libdispatch.dylib             	0x00007fff5537a20c _dispatch_queue_serial_drain + 635
+3   libdispatch.dylib             	0x00007fff5536d0fd _dispatch_queue_invoke + 373
+4   libdispatch.dylib             	0x00007fff5537a06f _dispatch_queue_serial_drain + 222
+5   libdispatch.dylib             	0x00007fff5536d0fd _dispatch_queue_invoke + 373
+6   libdispatch.dylib             	0x00007fff5537af02 _dispatch_root_queue_drain_deferred_wlh + 332
+7   libdispatch.dylib             	0x00007fff5537ed16 _dispatch_workloop_worker_thread + 880
+8   libsystem_pthread.dylib       	0x00007fff5562a033 _pthread_wqthread + 980
+9   libsystem_pthread.dylib       	0x00007fff55629c4d start_wqthread + 13
+
+Thread 9:
+0   libsystem_pthread.dylib       	0x00007fff55629c40 start_wqthread + 0
+1   ???                           	0xa8fafa6ba58200f2 0 + 12176319882794762482
+
+Thread 0 crashed with X86 Thread State (64-bit):
+  rax: 0x00007fe8a52f2200  rbx: 0x0000600002e42c40  rcx: 0x0000000000000000  rdx: 0x0000000000001bbb
+  rdi: 0x0000000008000101  rsi: 0x00007fe8a54dd5a1  rbp: 0x00007ffee055b910  rsp: 0x00007ffee055b900
+   r8: 0x0000000000000000   r9: 0x0000000000000000  r10: 0x00007ffee055b408  r11: 0xffffffffffe167ff
+  r12: 0x00007ffee055b910  r13: 0x0000600000126180  r14: 0x00007fff547a1e80  r15: 0x00007ffee055b920
+  rip: 0x00007fff2b458794  rfl: 0x0000000000010206  cr2: 0x000070000ac9a628
+  
+Logical CPU:     2
+Error Code:      0x00000000
+Trap Number:     6
+
+
+Binary Images:
+       0x10f6a4000 -        0x10fac2ff7 +com.twitter.twitter-mac (4.3.2 - 5002734) <3BC0BF69-D205-3845-9A00-492B8F015F12> /Applications/Twitter.app/Contents/MacOS/Twitter
+       0x10fbec000 -        0x10fc48ff7 +com.growl.growlframework (2.0.1 - 2.0.1) <6C20B93B-75B2-30A4-8267-8C81BF90872B> /Applications/Twitter.app/Contents/Frameworks/Growl.framework/Versions/A/Growl
+       0x113705000 -        0x113709fff  com.apple.audio.AppleHDAHALPlugIn (280.12 - 280.12) <9ACA0127-E687-3885-9475-1D5E4DD83168> /System/Library/Extensions/AppleHDA.kext/Contents/PlugIns/AppleHDAHALPlugIn.bundle/Contents/MacOS/AppleHDAHALPlugIn
+       0x113b49000 -        0x114083ff7  com.apple.driver.AppleIntelBDWGraphicsGLDriver (10.30.12 - 10.3.0) <E227A086-C662-335C-8B36-EA875AD6478F> /System/Library/Extensions/AppleIntelBDWGraphicsGLDriver.bundle/Contents/MacOS/AppleIntelBDWGraphicsGLDriver
+       0x11796a000 -        0x1179b498f  dyld (519.2.2) <6695F30B-4E88-3C0B-9867-7D738C44A3E6> /usr/lib/dyld
+       0x124585000 -        0x124af0fff  com.apple.audio.codecs.Components (7.0 - 7.0) <7233F241-5DC2-38E5-9156-2D825117075B> /System/Library/Components/AudioCodecs.component/Contents/MacOS/AudioCodecs
+       0x124bfe000 -        0x124da4ff7  com.apple.audio.units.Components (1.14 - 1.14) <5AE65A6C-EF2F-37AC-9DDD-4ABB69E78EF2> /System/Library/Components/CoreAudio.component/Contents/MacOS/CoreAudio
+    0x7fff261ee000 -     0x7fff2653cff7  com.apple.RawCamera.bundle (8.02.0 - 1017.2.2) <C799730B-C745-3775-BCE7-C67B8BD97FDB> /System/Library/CoreServices/RawCamera.bundle/Contents/MacOS/RawCamera
+    0x7fff2781a000 -     0x7fff278a6ff7  com.apple.driver.AppleIntelBDWGraphicsMTLDriver (10.30.12 - 10.3.0) <7A1AD3EA-2D09-381F-A080-CC108AE459DB> /System/Library/Extensions/AppleIntelBDWGraphicsMTLDriver.bundle/Contents/MacOS/AppleIntelBDWGraphicsMTLDriver
+    0x7fff29d11000 -     0x7fff29eecff7  com.apple.avfoundation (2.0 - 1528.24) <E4CE97EA-94C7-3CC4-B768-15AA25E76A83> /System/Library/Frameworks/AVFoundation.framework/Versions/A/AVFoundation
+    0x7fff29eed000 -     0x7fff29fa7ff7  com.apple.audio.AVFAudio (1.0 - ???) <E7DFCDAF-97A8-314F-BBED-76B9C5041E38> /System/Library/Frameworks/AVFoundation.framework/Versions/A/Frameworks/AVFAudio.framework/Versions/A/AVFAudio
+    0x7fff29fa9000 -     0x7fff2a0acff3  com.apple.AVKit (1.1 - 440.5.1) <11682387-4506-3294-8355-6130128A0C68> /System/Library/Frameworks/AVKit.framework/Versions/A/AVKit
+    0x7fff2a0ad000 -     0x7fff2a0adfff  com.apple.Accelerate (1.11 - Accelerate 1.11) <5AA750F5-D633-32BA-B7F3-4F651FB1761E> /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate
+    0x7fff2a0ae000 -     0x7fff2a0c4fe3  libCGInterfaces.dylib (417) <27E09D39-51B5-3297-BE33-0DB1736B833A> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/Libraries/libCGInterfaces.dylib
+    0x7fff2a0c5000 -     0x7fff2a5c3fc3  com.apple.vImage (8.1 - ???) <310976EE-E12D-39D7-8F58-6EE924E08576> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage
+    0x7fff2a5c4000 -     0x7fff2a71efcb  libBLAS.dylib (1211.30.1) <0DB0D952-BCF4-3479-BA2F-785FB1A57479> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib
+    0x7fff2a71f000 -     0x7fff2a74dfef  libBNNS.dylib (37) <49EB4DBA-877C-3D41-90A2-C3D982C72A54> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib
+    0x7fff2a74e000 -     0x7fff2ab0eff7  libLAPACK.dylib (1211.30.1) <2D4E4446-6B63-350C-BD68-A1B8FBE99539> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
+    0x7fff2ab0f000 -     0x7fff2ab24ff7  libLinearAlgebra.dylib (1211.30.1) <6C68F41D-1398-3AFE-BE72-C0ECA1B24BDC> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib
+    0x7fff2ab25000 -     0x7fff2ab2aff3  libQuadrature.dylib (3) <3D6BF66A-55B2-3692-BAC7-DEB0C676ED29> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib
+    0x7fff2ab2b000 -     0x7fff2ab89fff  libSparse.dylib (79.1.1) <7AD0F8A8-FD36-36FE-B83D-58648EBD0027> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib
+    0x7fff2ab8a000 -     0x7fff2ab9dfff  libSparseBLAS.dylib (1211.30.1) <42506F6F-0F38-322E-9903-C1DB66E4DA05> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib
+    0x7fff2ab9e000 -     0x7fff2ad4afc3  libvDSP.dylib (622.20.8) <6FFCA52B-7D60-326A-ADF2-601F39A8685A> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib
+    0x7fff2ad4b000 -     0x7fff2adfbfef  libvMisc.dylib (622.20.8) <54F90047-879F-3260-8604-6E453149B49E> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib
+    0x7fff2adfc000 -     0x7fff2adfcfff  com.apple.Accelerate.vecLib (3.11 - vecLib 3.11) <8A96A8ED-7B88-3D17-8D17-41D224E0EC90> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib
+    0x7fff2adfd000 -     0x7fff2ae54ff7  com.apple.Accounts (113 - 113) <02AC0AF3-D620-340E-BE52-CD31119F9CD8> /System/Library/Frameworks/Accounts.framework/Versions/A/Accounts
+    0x7fff2ae55000 -     0x7fff2b0ebfff  com.apple.AddressBook.framework (11.0 - 1808.6) <F6D3B5FE-46C5-31E6-8D30-2DE805D883AA> /System/Library/Frameworks/AddressBook.framework/Versions/A/AddressBook
+    0x7fff2b0ec000 -     0x7fff2bf49fff  com.apple.AppKit (6.9 - 1561.20.106) <7A71ACCF-2DF5-3557-BB22-3A9FC9F71CCF> /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit
+    0x7fff2bf9b000 -     0x7fff2bf9bfff  com.apple.ApplicationServices (48 - 50) <7627DBD6-497B-3AB7-9B63-F0532EDF09B8> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
+    0x7fff2bf9c000 -     0x7fff2c002fff  com.apple.ApplicationServices.ATS (377 - 445) <CDF5F6D7-4E7D-3D28-9FBA-1B53AD9FA8F8> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS
+    0x7fff2c09b000 -     0x7fff2c1bdfff  libFontParser.dylib (222.1.2) <11BD5EEF-AF18-33FB-B114-DD611932E822> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib
+    0x7fff2c1be000 -     0x7fff2c208ff7  libFontRegistry.dylib (221) <A22F82C0-B4FE-3DB5-B968-79B28257DF2F> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib
+    0x7fff2c2ad000 -     0x7fff2c2e0ff7  libTrueTypeScaler.dylib (222.1.2) <33C245B4-E1AD-3C89-B735-5A5610E547C8> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libTrueTypeScaler.dylib
+    0x7fff2c34a000 -     0x7fff2c34eff3  com.apple.ColorSyncLegacy (4.13.0 - 1) <42C25E85-1CF3-3DEC-A434-BE69F68F4318> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy
+    0x7fff2c3ee000 -     0x7fff2c440ff7  com.apple.HIServices (1.22 - 622) <2E83CD6F-ED98-3C29-BD0A-8525E38AB5DB> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices
+    0x7fff2c441000 -     0x7fff2c44ffff  com.apple.LangAnalysis (1.7.0 - 1.7.0) <71A9C815-AC55-3E36-A618-F6778F5119AD> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis
+    0x7fff2c450000 -     0x7fff2c49cfff  com.apple.print.framework.PrintCore (13 - 503) <A69E2BAD-2B66-38CC-9D3A-0A0EBC41341D> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore
+    0x7fff2c49d000 -     0x7fff2c4d7fff  com.apple.QD (3.12 - 403) <38D8106A-4FFA-3FE9-9999-714CADD7EE9C> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD
+    0x7fff2c4d8000 -     0x7fff2c4e4fff  com.apple.speech.synthesis.framework (7.2.1 - 7.2.1) <BA7EDC49-E216-3D96-A7B7-8C76B862D484> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis
+    0x7fff2c4e5000 -     0x7fff2c770ff7  com.apple.audio.toolbox.AudioToolbox (1.14 - 1.14) <71699B6E-8B94-39E2-801F-8467C2B5B621> /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox
+    0x7fff2c772000 -     0x7fff2c772fff  com.apple.audio.units.AudioUnit (1.14 - 1.14) <28C7FC0C-D2E5-3703-916F-866A0F823229> /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit
+    0x7fff2ca87000 -     0x7fff2ce19fff  com.apple.CFNetwork (893.13.1 - 893.13.1) <567231F4-4080-3B2D-8349-9177BD358804> /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork
+    0x7fff2ce2e000 -     0x7fff2ce2efff  com.apple.Carbon (158 - 158) <FCD7A9FF-5E53-3B0C-8A52-691C11B2A0C5> /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
+    0x7fff2ce2f000 -     0x7fff2ce32ffb  com.apple.CommonPanels (1.2.6 - 98) <39C8EBA3-EEB2-335B-8A88-D6C64BAA112F> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels
+    0x7fff2ce33000 -     0x7fff2d138ff7  com.apple.HIToolbox (2.1.1 - 910.4) <ADBE7A1B-0402-369C-A6F3-494E8CACD619> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox
+    0x7fff2d139000 -     0x7fff2d13cffb  com.apple.help (1.3.8 - 64) <18D02016-119A-33E8-AEB0-E9466BA4AD56> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help
+    0x7fff2d13d000 -     0x7fff2d142fff  com.apple.ImageCapture (9.0 - 9.0) <2DE590E5-DF0E-3962-A2BE-06EBC79B3D72> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture
+    0x7fff2d143000 -     0x7fff2d1d8ffb  com.apple.ink.framework (10.9 - 220) <D8AECAE3-9FD2-32E3-B659-026F33650BB2> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink
+    0x7fff2d1d9000 -     0x7fff2d1f3ff7  com.apple.openscripting (1.7 - 174) <66899B51-ADFD-360D-88E9-B52439F531B4> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting
+    0x7fff2d214000 -     0x7fff2d215fff  com.apple.print.framework.Print (12 - 267) <E4CBAAFC-9045-38AC-9F93-8C931DDED9D8> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print
+    0x7fff2d216000 -     0x7fff2d218ff7  com.apple.securityhi (9.0 - 55006) <E7668200-B4CB-3612-96B8-D57E94077787> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI
+    0x7fff2d219000 -     0x7fff2d21ffff  com.apple.speech.recognition.framework (6.0.3 - 6.0.3) <1F10ED1F-12C7-39AC-88A0-43A1338F9316> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition
+    0x7fff2d32c000 -     0x7fff2d32cfff  com.apple.Cocoa (6.11 - 22) <F1AED1E8-ACC2-31F0-B85E-17E41167FC88> /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
+    0x7fff2d33a000 -     0x7fff2d3f3ff7  com.apple.ColorSync (4.13.0 - 546) <A5E013D9-7305-3026-879E-4D1F038A430D> /System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync
+    0x7fff2d580000 -     0x7fff2d613ff7  com.apple.audio.CoreAudio (4.3.0 - 4.3.0) <4DE794D4-F018-31E8-B3CE-CF8DBE68D14E> /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio
+    0x7fff2d67a000 -     0x7fff2d6a3ffb  com.apple.CoreBluetooth (1.0 - 1) <942F88A5-AD68-3359-90D5-6F1A3311C51A> /System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth
+    0x7fff2d6a4000 -     0x7fff2d9f8fe7  com.apple.CoreData (120 - 849.2) <4407C44B-34CC-3D23-AEDF-AD866D414EBF> /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData
+    0x7fff2d9f9000 -     0x7fff2dac5fff  com.apple.CoreDisplay (1.0 - 81.7) <CE6B9237-B33D-3D8F-8C1C-4F57BD810D24> /System/Library/Frameworks/CoreDisplay.framework/Versions/A/CoreDisplay
+    0x7fff2dac6000 -     0x7fff2df66fff  com.apple.CoreFoundation (6.9 - 1450.16) <23F8373A-FA3F-37A2-BA5B-70061BFCCD21> /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
+    0x7fff2df68000 -     0x7fff2e575fef  com.apple.CoreGraphics (2.0 - 1129.5) <F37BFBD2-CC21-3521-B034-9D4D36197487> /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics
+    0x7fff2e577000 -     0x7fff2e866fff  com.apple.CoreImage (13.0.0 - 579.2.9) <B5661FF7-7558-308E-A3B7-C280F7A1DA78> /System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage
+    0x7fff2e867000 -     0x7fff2e8d2ff7  com.apple.corelocation (2237.0.22) <0E78BBE7-9016-3A12-88EB-425EFE69E643> /System/Library/Frameworks/CoreLocation.framework/Versions/A/CoreLocation
+    0x7fff2eaf5000 -     0x7fff2ebd5ff7  com.apple.CoreMedia (1.0 - 2267.40.5) <AE634D2B-FEB5-3669-80CC-F1C238698D44> /System/Library/Frameworks/CoreMedia.framework/Versions/A/CoreMedia
+    0x7fff2ebd6000 -     0x7fff2ec24fff  com.apple.CoreMediaIO (812.0 - 4993) <1D78D2AE-626B-3D0C-83EA-EA385682F3F3> /System/Library/Frameworks/CoreMediaIO.framework/Versions/A/CoreMediaIO
+    0x7fff2ec25000 -     0x7fff2ec25fff  com.apple.CoreServices (822.19 - 822.19) <0C60B639-4CC4-3F57-BC5E-DB71EB75F7F4> /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices
+    0x7fff2ec26000 -     0x7fff2ec9affb  com.apple.AE (735.1 - 735.1) <D0C73200-90A7-3FD1-A6EC-97055AA367E2> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE
+    0x7fff2ec9b000 -     0x7fff2ef72ff7  com.apple.CoreServices.CarbonCore (1178.2 - 1178.2) <A1FE74F8-953B-371E-A8AC-E87B30FB79C6> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore
+    0x7fff2ef73000 -     0x7fff2efa7ff7  com.apple.DictionaryServices (1.2 - 284) <3FCEE280-8DD0-37C9-BFD4-7BA87AAFC8EF> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices
+    0x7fff2efa8000 -     0x7fff2efb0ff3  com.apple.CoreServices.FSEvents (1239 - 1239) <7BBC5CB7-DBC8-316B-99B0-781827159A2F> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents
+    0x7fff2efb1000 -     0x7fff2f169ff7  com.apple.LaunchServices (822.19 - 822.19) <F3AC96C3-0B52-3AA9-9DA8-288BBC523C07> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices
+    0x7fff2f16a000 -     0x7fff2f219ff7  com.apple.Metadata (10.7.0 - 1191.2.6) <FB66B298-D55D-398A-BEDB-CB7B82956AE5> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata
+    0x7fff2f21a000 -     0x7fff2f277ff7  com.apple.CoreServices.OSServices (822.19 - 822.19) <408FB1A4-58E9-34D4-8022-A9EEC8502762> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices
+    0x7fff2f278000 -     0x7fff2f2e6fff  com.apple.SearchKit (1.4.0 - 1.4.0) <14053F88-2C76-35CA-9FC1-2A9BC0B63F88> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit
+    0x7fff2f2e7000 -     0x7fff2f30bffb  com.apple.coreservices.SharedFileList (71.4 - 71.4) <4AA6DCF5-BAF8-36FA-A8B0-EDF518EFEF14> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList
+    0x7fff2f5b5000 -     0x7fff2f703ffb  com.apple.CoreText (352.0 - 578.12) <DA0BC559-277A-32BA-91EA-FD2F02EA186F> /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText
+    0x7fff2f704000 -     0x7fff2f73eff3  com.apple.CoreVideo (1.8 - 279.2) <A8FC5325-D092-3A28-A1CF-5C94B8101F71> /System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo
+    0x7fff2f73f000 -     0x7fff2f7c9ffb  com.apple.framework.CoreWLAN (13.0 - 1339) <FFA24EBB-75A1-3B33-9B26-96BDAF758CC0> /System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN
+    0x7fff2f957000 -     0x7fff2f962ff7  com.apple.DirectoryService.Framework (10.13 - 207) <79F272D7-48AE-3D1E-AC5B-3CEB5F16E7D5> /System/Library/Frameworks/DirectoryService.framework/Versions/A/DirectoryService
+    0x7fff2f963000 -     0x7fff2fa1dfff  com.apple.DiscRecording (9.0.3 - 9030.4.5) <2094BAC4-4F37-3741-B9BD-60158A63C503> /System/Library/Frameworks/DiscRecording.framework/Versions/A/DiscRecording
+    0x7fff2fa44000 -     0x7fff2fa49fff  com.apple.DiskArbitration (2.7 - 2.7) <44836CE9-A9ED-3017-972A-7A0A3D6B472B> /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
+    0x7fff2fc0a000 -     0x7fff2ffcffff  com.apple.Foundation (6.9 - 1450.16) <7FEC6610-70EA-3A8D-8EC4-7E99BAF1E312> /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation
+    0x7fff3003f000 -     0x7fff3006ffff  com.apple.GSS (4.0 - 2.0) <3B4B4509-B5A3-396B-9C71-80BAE84476FA> /System/Library/Frameworks/GSS.framework/Versions/A/GSS
+    0x7fff30181000 -     0x7fff30284ff3  com.apple.Bluetooth (6.0.2 - 6.0.2f2) <AFC4A40B-AE56-3C53-A2B1-D0D9C335E21D> /System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth
+    0x7fff302e4000 -     0x7fff3037ffff  com.apple.framework.IOKit (2.0.2 - 1445.31.1) <7556086A-EFAF-3262-9822-6F666CFC6655> /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
+    0x7fff30381000 -     0x7fff30388ffb  com.apple.IOSurface (209.2.2 - 209.2.2) <6D35A601-1C47-37BE-AD31-F8EB88F67573> /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface
+    0x7fff30389000 -     0x7fff303deff3  com.apple.ImageCaptureCore (7.0 - 7.0) <CBE349D4-2C8B-31F5-B5ED-B8E978DA9245> /System/Library/Frameworks/ImageCaptureCore.framework/Versions/A/ImageCaptureCore
+    0x7fff303df000 -     0x7fff30556ff7  com.apple.ImageIO.framework (3.3.0 - 1713) <DB207AD2-06B5-3065-976B-F53C477D79C0> /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
+    0x7fff30557000 -     0x7fff3055bffb  libGIF.dylib (1713) <C65B2846-1B94-3BB3-BBBF-5A9E5054CE1E> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib
+    0x7fff3055c000 -     0x7fff30643fff  libJP2.dylib (1713) <8323253E-278A-3486-801A-83E143C19712> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib
+    0x7fff30644000 -     0x7fff30667ff7  libJPEG.dylib (1713) <2D846A18-D8AF-3573-803B-BEABCBAC38D1> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib
+    0x7fff30943000 -     0x7fff30969feb  libPng.dylib (1713) <546F41CE-185C-31A0-B61C-1012AA932624> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib
+    0x7fff3096a000 -     0x7fff3096cffb  libRadiance.dylib (1713) <31787C46-4A2B-3CDF-95E9-EC1BD4794917> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib
+    0x7fff3096d000 -     0x7fff309bafeb  libTIFF.dylib (1713) <5319B2E1-83D2-30C7-A7BC-A0CE0B07885D> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib
+    0x7fff30b76000 -     0x7fff316dcff7  com.apple.JavaScriptCore (13604 - 13604.4.7.1.3) <3ACE94F3-B9B6-38FD-9CE7-7B44F374C143> /System/Library/Frameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore
+    0x7fff316f4000 -     0x7fff3170dff7  com.apple.Kerberos (3.0 - 1) <CAF075C0-4C24-3ACE-9AE6-77BEFDEA3622> /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos
+    0x7fff3170e000 -     0x7fff31743fff  com.apple.LDAPFramework (2.4.28 - 194.5) <8419BDB5-12DF-3BC9-871D-7A270E080249> /System/Library/Frameworks/LDAP.framework/Versions/A/LDAP
+    0x7fff319c5000 -     0x7fff319ccfff  com.apple.MediaAccessibility (1.0 - 114) <D72C593A-AC32-3419-AB86-6B07217EBFD5> /System/Library/Frameworks/MediaAccessibility.framework/Versions/A/MediaAccessibility
+    0x7fff319e2000 -     0x7fff31a6effb  com.apple.MediaPlayer (1.0 - 1.0) <76758A48-DB40-3331-8517-07D9A445836D> /System/Library/Frameworks/MediaPlayer.framework/Versions/A/MediaPlayer
+    0x7fff31a6f000 -     0x7fff32088ff7  com.apple.MediaToolbox (1.0 - 2267.40.5) <BC84C8E1-FC56-3996-9110-E1BEF85587F7> /System/Library/Frameworks/MediaToolbox.framework/Versions/A/MediaToolbox
+    0x7fff3208a000 -     0x7fff32109fff  com.apple.Metal (124.7 - 124.7) <C266564D-21B5-3FD9-92D5-03974F3186C4> /System/Library/Frameworks/Metal.framework/Versions/A/Metal
+    0x7fff32126000 -     0x7fff3213bfff  com.apple.MetalPerformanceShaders.MPSCore (1.0 - 1) <D4BCBA84-AD1B-33DC-99F3-16F9E5E50906> /System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSCore.framework/Versions/A/MPSCore
+    0x7fff3213c000 -     0x7fff321a7fef  com.apple.MetalPerformanceShaders.MPSImage (1.0 - 1) <E504EC97-FAD7-36DC-B151-6F89AB911E3A> /System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSImage.framework/Versions/A/MPSImage
+    0x7fff321a8000 -     0x7fff321cbfff  com.apple.MetalPerformanceShaders.MPSMatrix (1.0 - 1) <A5B6F6FC-A19A-32C0-A999-98B6688760C7> /System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSMatrix.framework/Versions/A/MPSMatrix
+    0x7fff321cc000 -     0x7fff3224cff7  com.apple.MetalPerformanceShaders.MPSNeuralNetwork (1.0 - 1) <D0D8F13F-ACD4-3B61-BE54-121CCB05ECF4> /System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSNeuralNetwork.framework/Versions/A/MPSNeuralNetwork
+    0x7fff3224d000 -     0x7fff3224dff7  com.apple.MetalPerformanceShaders.MetalPerformanceShaders (1.0 - 1) <2E8723FC-AA53-3596-B6A4-220A378B7A5A> /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders
+    0x7fff33256000 -     0x7fff33262ffb  com.apple.NetFS (6.0 - 4.0) <81B22AE7-7094-30F2-BF41-84CA05EDB95B> /System/Library/Frameworks/NetFS.framework/Versions/A/NetFS
+    0x7fff333e2000 -     0x7fff33418ffb  com.apple.notificationcenter (1.0 - 639.10) <EA67E1F8-9506-3336-8F84-FD3512F321B7> /System/Library/Frameworks/NotificationCenter.framework/Versions/A/NotificationCenter
+    0x7fff3604a000 -     0x7fff36052fef  libcldcpuengine.dylib (2.8.7) <DD781325-D94E-3AD7-8D6C-817FB3068917> /System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries/libcldcpuengine.dylib
+    0x7fff36053000 -     0x7fff360a0ffb  com.apple.opencl (2.8.12 - 2.8.12) <0AACB21D-AAC4-337C-8FF6-A8F6196614EE> /System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL
+    0x7fff360a1000 -     0x7fff360bdffb  com.apple.CFOpenDirectory (10.13 - 207) <7664F745-96E0-3F9F-964B-6014928902FB> /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory
+    0x7fff360be000 -     0x7fff360c9fff  com.apple.OpenDirectory (10.13 - 207) <1550BB27-D605-398C-8670-48700C86D674> /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory
+    0x7fff37248000 -     0x7fff3724afff  libCVMSPluginSupport.dylib (16.4.2) <A967BC8B-ABB3-393F-BF34-BD32B45831F7> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib
+    0x7fff3724b000 -     0x7fff3724fff7  libCoreFSCache.dylib (162.4) <B325B709-0C81-357A-B9F1-6E0027B64F9B> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreFSCache.dylib
+    0x7fff37250000 -     0x7fff37254fff  libCoreVMClient.dylib (162.4) <B129DB84-39BA-34E4-9FB7-20A020A1BB86> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib
+    0x7fff37255000 -     0x7fff3725dfff  libGFXShared.dylib (16.4.2) <07F1D947-F79B-3608-9080-E4DBFE13AF1D> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib
+    0x7fff3725e000 -     0x7fff37269fff  libGL.dylib (16.4.2) <97D6871A-BAF1-33DD-9ED7-BE7BB437F378> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+    0x7fff3726a000 -     0x7fff372a5fe7  libGLImage.dylib (16.4.2) <3E2802DF-4998-31DB-B3A2-65720DE919A5> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib
+    0x7fff372a6000 -     0x7fff37412fff  libGLProgrammability.dylib (16.4.2) <3505EF20-FA3D-321B-8C11-D9CA74656F30> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLProgrammability.dylib
+    0x7fff37413000 -     0x7fff37451ffb  libGLU.dylib (16.4.2) <ECABCFAB-E400-3667-8EE1-586C07E0E214> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib
+    0x7fff37dc9000 -     0x7fff37dd7ffb  com.apple.opengl (16.4.2 - 16.4.2) <C8C31EF5-8DB4-336F-A87C-5D520C7EFDC5> /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
+    0x7fff37dd8000 -     0x7fff37f6fffb  GLEngine (16.4.2) <8F35484D-9C09-3D79-9825-7E73661326D4> /System/Library/Frameworks/OpenGL.framework/Versions/A/Resources/GLEngine.bundle/GLEngine
+    0x7fff37f70000 -     0x7fff37f98ffb  GLRendererFloat (16.4.2) <463BD481-6E1A-3EFC-A93B-C7E9292F76ED> /System/Library/Frameworks/OpenGL.framework/Versions/A/Resources/GLRendererFloat.bundle/GLRendererFloat
+    0x7fff3814f000 -     0x7fff3829bfff  com.apple.QTKit (7.7.3 - 3014) <CF2818E6-E215-3C24-A2AC-1B5F8AD7E398> /System/Library/Frameworks/QTKit.framework/Versions/A/QTKit
+    0x7fff3829c000 -     0x7fff38501ff7  com.apple.imageKit (3.0 - 1040) <5A1261EA-76C5-386C-9F46-06EE804E2234> /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/ImageKit.framework/Versions/A/ImageKit
+    0x7fff38502000 -     0x7fff385eeff3  com.apple.PDFKit (1.0 - 677.4) <B5E41E73-0F19-3026-A30E-121F66A38019> /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/PDFKit.framework/Versions/A/PDFKit
+    0x7fff385ef000 -     0x7fff38b01ff7  com.apple.QuartzComposer (5.1 - 364) <D99600D5-C066-3D49-8641-369A69300D16> /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/QuartzComposer.framework/Versions/A/QuartzComposer
+    0x7fff38b02000 -     0x7fff38b25fff  com.apple.quartzfilters (1.10.0 - 1.10.0) <8CBE10F3-828F-373C-B92A-A5289CBCF77A> /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/QuartzFilters.framework/Versions/A/QuartzFilters
+    0x7fff38b26000 -     0x7fff38c1dff7  com.apple.QuickLookUIFramework (5.0 - 743.7) <53CAEAD9-0C1D-3CFB-866A-21F4745544D7> /System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/QuickLookUI.framework/Versions/A/QuickLookUI
+    0x7fff38c1e000 -     0x7fff38c1efff  com.apple.quartzframework (1.5 - 21) <3F3BE91F-A032-3E92-ACEA-E2DFEC999E93> /System/Library/Frameworks/Quartz.framework/Versions/A/Quartz
+    0x7fff38c1f000 -     0x7fff38e67fff  com.apple.QuartzCore (1.11 - 584.8.94) <8D6B5735-852F-36D3-9349-C423582F743B> /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore
+    0x7fff38e68000 -     0x7fff38ebfff7  com.apple.QuickLookFramework (5.0 - 743.7) <0CB6717C-CCE2-3591-A31E-A8EF01DD4FC8> /System/Library/Frameworks/QuickLook.framework/Versions/A/QuickLook
+    0x7fff39084000 -     0x7fff3909afff  com.apple.SafariServices.framework (13604 - 13604.4.7.1.3) <4DA6B5BD-0F79-3E34-9206-58A0FF3C01D2> /System/Library/Frameworks/SafariServices.framework/Versions/A/SafariServices
+    0x7fff396a0000 -     0x7fff399b7fff  com.apple.security (7.0 - 58286.31.2) <D31B36DF-8956-3205-BFBA-98732DA715E5> /System/Library/Frameworks/Security.framework/Versions/A/Security
+    0x7fff399b8000 -     0x7fff39a42ff7  com.apple.securityfoundation (6.0 - 55185.30.4) <A1201529-3718-31C4-9D9E-BBD2A04B6751> /System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation
+    0x7fff39a43000 -     0x7fff39a73ff3  com.apple.securityinterface (10.0 - 55109.30.2) <B305DA7D-7866-3194-B498-F9995D232486> /System/Library/Frameworks/SecurityInterface.framework/Versions/A/SecurityInterface
+    0x7fff39a74000 -     0x7fff39a77ffb  com.apple.xpc.ServiceManagement (1.0 - 1) <B11C3C64-6FE7-3A78-B583-D790B7CCE95A> /System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement
+    0x7fff39e1c000 -     0x7fff39e8cff3  com.apple.SystemConfiguration (1.17 - 1.17) <3C6B2BB9-43AB-39AD-8027-38E30A8A4186> /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration
+    0x7fff3a041000 -     0x7fff3a3baff7  com.apple.VideoToolbox (1.0 - 2267.40.5) <CC88FFB3-5DBE-33C0-AF8D-2C915D915A24> /System/Library/Frameworks/VideoToolbox.framework/Versions/A/VideoToolbox
+    0x7fff3a662000 -     0x7fff3ab7bfe3  libwebrtc.dylib (7604.4.7.1.3) <777100A8-D98C-3DC1-931C-BBC689345FA2> /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libwebrtc.dylib
+    0x7fff3ab7c000 -     0x7fff3c018fff  com.apple.WebCore (13604 - 13604.4.7.1.3) <FD0252AD-1BF9-30EE-BF2E-4409722582EB> /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore
+    0x7fff3c019000 -     0x7fff3c20aff7  com.apple.WebKitLegacy (13604 - 13604.4.7.1.3) <91DD2BFE-AA52-38AD-920C-D21D22ECA1B3> /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy
+    0x7fff3c20b000 -     0x7fff3c5fafff  com.apple.WebKit (13604 - 13604.4.7.1.3) <E9C0A9B5-5331-3FDE-9587-968A86981D53> /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit
+    0x7fff3ca6a000 -     0x7fff3caf6ff7  com.apple.APFS (1.0 - 1) <834EAD5F-0C4E-3C33-A654-8E1670CEC457> /System/Library/PrivateFrameworks/APFS.framework/Versions/A/APFS
+    0x7fff3d704000 -     0x7fff3d72cfff  com.apple.framework.Apple80211 (13.0 - 1345) <BD86685B-6221-300D-9A97-119285C43DE9> /System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211
+    0x7fff3d72e000 -     0x7fff3d73dff7  com.apple.AppleFSCompression (96.30.2 - 1.0) <CFA90544-68EB-3CCE-A8F7-1B03974F3B85> /System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression
+    0x7fff3d73e000 -     0x7fff3d822ff7  com.apple.AppleGVAFramework (11.3.7 - 11.3.7) <EB9E64AF-AFF6-3747-8F0E-E77377328143> /System/Library/PrivateFrameworks/AppleGVA.framework/Versions/A/AppleGVA
+    0x7fff3d879000 -     0x7fff3d8c1ff3  com.apple.AppleJPEG (1.0 - 1) <8BBD5180-5BF9-33DB-8B91-974B1D0AECFB> /System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG
+    0x7fff3d8d4000 -     0x7fff3d8f2ff3  com.apple.aps.framework (4.0 - 4.0) <932274E4-DCD5-30D5-9AC7-58CEF4571EB3> /System/Library/PrivateFrameworks/ApplePushService.framework/Versions/A/ApplePushService
+    0x7fff3d8f3000 -     0x7fff3d8fbff3  com.apple.AppleSRP (5.0 - 1) <4CEC34CF-63E3-3023-B61B-F8D133698534> /System/Library/PrivateFrameworks/AppleSRP.framework/Versions/A/AppleSRP
+    0x7fff3d8fc000 -     0x7fff3d924fff  com.apple.applesauce (1.0 - ???) <32FF4851-2F68-35BA-835F-91856A20C323> /System/Library/PrivateFrameworks/AppleSauce.framework/Versions/A/AppleSauce
+    0x7fff3d9ed000 -     0x7fff3d9f0ff3  com.apple.AppleSystemInfo (3.1.5 - 3.1.5) <A6795AC1-D528-3A2F-9C43-14EBFC57B7D6> /System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo
+    0x7fff3d9f1000 -     0x7fff3da41ff7  com.apple.AppleVAFramework (5.0.39 - 5.0.39) <4B830521-2A54-3116-8103-127E631FEDC8> /System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA
+    0x7fff3e110000 -     0x7fff3e117ff7  com.apple.coreservices.BackgroundTaskManagement (1.0 - 57.1) <47B6301F-D908-3811-BB9E-DA16D9B29A34> /System/Library/PrivateFrameworks/BackgroundTaskManagement.framework/Versions/A/BackgroundTaskManagement
+    0x7fff3e118000 -     0x7fff3e19fff7  com.apple.backup.framework (1.9.2 - 1.9.2) <40C6CFA8-4013-3AFB-97CE-8A09388FA343> /System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup
+    0x7fff3e215000 -     0x7fff3e251fff  com.apple.bom (14.0 - 194.2) <ED2FFB9D-4DA4-322B-89C0-102D790649CD> /System/Library/PrivateFrameworks/Bom.framework/Versions/A/Bom
+    0x7fff3e86f000 -     0x7fff3e89cfff  com.apple.CalendarAgentLink (8.0 - 250) <55B60B04-2EAA-3F22-88EF-1602129D5294> /System/Library/PrivateFrameworks/CalendarAgentLink.framework/Versions/A/CalendarAgentLink
+    0x7fff3ef63000 -     0x7fff3efb2ff3  com.apple.ChunkingLibrary (188 - 188) <84E024A0-5F95-3A30-A60B-102343AE46B7> /System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary
+    0x7fff3fb2e000 -     0x7fff3fb37ff3  com.apple.CommonAuth (4.0 - 2.0) <11B2D184-36B8-3624-B1AD-7B6037D76160> /System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth
+    0x7fff3fb4c000 -     0x7fff3fb61ff7  com.apple.commonutilities (8.0 - 900) <518FBC2C-0AF3-39DF-B454-526311796A49> /System/Library/PrivateFrameworks/CommonUtilities.framework/Versions/A/CommonUtilities
+    0x7fff3fce5000 -     0x7fff3fd45fff  com.apple.AddressBook.ContactsFoundation (8.0 - ???) <9B39DF3E-5B7F-3467-AC17-23258F76A376> /System/Library/PrivateFrameworks/ContactsFoundation.framework/Versions/A/ContactsFoundation
+    0x7fff3fd46000 -     0x7fff3fd68fff  com.apple.contacts.ContactsPersistence (1.0 - 2330.3) <B7EA2D0A-8A43-3E9C-A7D2-E9585064C328> /System/Library/PrivateFrameworks/ContactsPersistence.framework/Versions/A/ContactsPersistence
+    0x7fff3fdc8000 -     0x7fff401a8fff  com.apple.CoreAUC (249.0.0 - 249.0.0) <7F406271-A215-3C75-BDAA-B9611BA2822E> /System/Library/PrivateFrameworks/CoreAUC.framework/Versions/A/CoreAUC
+    0x7fff401a9000 -     0x7fff401d9ff7  com.apple.CoreAVCHD (5.9.0 - 5900.4.1) <D0879D8F-488A-3D46-BC50-AD7B0642C0E8> /System/Library/PrivateFrameworks/CoreAVCHD.framework/Versions/A/CoreAVCHD
+    0x7fff401f0000 -     0x7fff4021dfff  com.apple.CoreAnalytics.CoreAnalytics (1.0 - 1) <2D7C7B8C-C9C8-3F32-B43E-E792CD88A77D> /System/Library/PrivateFrameworks/CoreAnalytics.framework/Versions/A/CoreAnalytics
+    0x7fff403d4000 -     0x7fff403ddff7  com.apple.frameworks.CoreDaemon (1.3 - 1.3) <0A87A91C-A2CF-3BB1-9038-7F610111BC30> /System/Library/PrivateFrameworks/CoreDaemon.framework/Versions/B/CoreDaemon
+    0x7fff40544000 -     0x7fff40554ff7  com.apple.CoreEmoji (1.0 - 69.3) <A4357F5C-0C38-3A61-B456-D7321EB2CEE5> /System/Library/PrivateFrameworks/CoreEmoji.framework/Versions/A/CoreEmoji
+    0x7fff40e0f000 -     0x7fff40e25ff7  com.apple.CoreMediaAuthoring (2.2 - 956) <A5003E93-68B3-3A0E-8252-454CC4CFEC4D> /System/Library/PrivateFrameworks/CoreMediaAuthoring.framework/Versions/A/CoreMediaAuthoring
+    0x7fff40f67000 -     0x7fff40fc4ff7  com.apple.CoreNLP (1.0 - 130.4.1) <1F329E38-E7D0-3455-981B-48F434C9E8CC> /System/Library/PrivateFrameworks/CoreNLP.framework/Versions/A/CoreNLP
+    0x7fff4114d000 -     0x7fff41152ff7  com.apple.CoreOptimization (1.0 - 1) <785B622B-8F7D-3B4D-83AF-EB98CB79FFF6> /System/Library/PrivateFrameworks/CoreOptimization.framework/Versions/A/CoreOptimization
+    0x7fff41153000 -     0x7fff411f8ff7  com.apple.CorePDF (4.0 - 414) <353C8875-F5A0-37B0-82CF-CAFCE1A95D50> /System/Library/PrivateFrameworks/CorePDF.framework/Versions/A/CorePDF
+    0x7fff41298000 -     0x7fff412a0ff7  com.apple.CorePhoneNumbers (1.0 - 1) <9966298D-C45D-39FC-8CC4-58288F50D3F8> /System/Library/PrivateFrameworks/CorePhoneNumbers.framework/Versions/A/CorePhoneNumbers
+    0x7fff412a1000 -     0x7fff412fdfff  com.apple.CorePrediction (1.0 - 1) <B1E687BA-4E62-321B-8C87-D37C540A5A68> /System/Library/PrivateFrameworks/CorePrediction.framework/Versions/A/CorePrediction
+    0x7fff4142a000 -     0x7fff4145bff3  com.apple.CoreServicesInternal (309.1 - 309.1) <EB09CAFC-AE9B-3257-BE45-5471D9F64AAD> /System/Library/PrivateFrameworks/CoreServicesInternal.framework/Versions/A/CoreServicesInternal
+    0x7fff417aa000 -     0x7fff4183bfff  com.apple.CoreSymbolication (63075) <2458D96C-1C31-34F8-93F0-73DB0042CB30> /System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication
+    0x7fff418be000 -     0x7fff419f2fff  com.apple.coreui (2.1 - 492.2) <FE0B32BC-958D-3445-866E-A3905626396D> /System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI
+    0x7fff419f3000 -     0x7fff41afeff3  com.apple.CoreUtils (5.3 - 530.57) <1DE5249E-35C5-3B13-BA5B-0C1AA4E17CDD> /System/Library/PrivateFrameworks/CoreUtils.framework/Versions/A/CoreUtils
+    0x7fff41b53000 -     0x7fff41bb7fff  com.apple.framework.CoreWiFi (13.0 - 1339) <1741FD6D-3DF2-3D2D-9B56-92A6AA0D1146> /System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi
+    0x7fff41bb8000 -     0x7fff41bc7ff7  com.apple.CrashReporterSupport (10.13 - 1) <6B5B2B78-15D2-363F-BE34-8F9226E79E24> /System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport
+    0x7fff41c44000 -     0x7fff41c53ff7  com.apple.framework.DFRFoundation (1.0 - 191.1) <09E9A14C-E7A8-3386-8323-270FA28BFB81> /System/Library/PrivateFrameworks/DFRFoundation.framework/Versions/A/DFRFoundation
+    0x7fff41c56000 -     0x7fff41c5affb  com.apple.DSExternalDisplay (3.1 - 380) <BEC07C7C-F3AC-3CF3-B13E-3EBFD6224C0D> /System/Library/PrivateFrameworks/DSExternalDisplay.framework/Versions/A/DSExternalDisplay
+    0x7fff41c9f000 -     0x7fff41cdfffb  com.apple.datadetectors (5.0 - 376) <612C677D-BB71-35D2-BBF3-EA9EC51ADF12> /System/Library/PrivateFrameworks/DataDetectors.framework/Versions/A/DataDetectors
+    0x7fff41ce0000 -     0x7fff41d56fff  com.apple.datadetectorscore (7.0 - 590.3) <792593BC-21C7-3E0C-929E-067CD725FCBD> /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore
+    0x7fff41da4000 -     0x7fff41de4ff7  com.apple.DebugSymbols (141 - 141) <99562E28-0E56-3F6F-93A1-EF997A5E1F87> /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols
+    0x7fff41de5000 -     0x7fff41f14fff  com.apple.desktopservices (1.12.2 - 1.12.2) <8E068AF7-FB72-38E2-948E-6C13F359C69D> /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv
+    0x7fff41f73000 -     0x7fff41f74ff7  com.apple.diagnosticlogcollection (10.0 - 1000) <DFD57FDB-CB78-3FB0-B49B-4586F9E0DFC1> /System/Library/PrivateFrameworks/DiagnosticLogCollection.framework/Versions/A/DiagnosticLogCollection
+    0x7fff42006000 -     0x7fff420d8ff7  com.apple.DiskImagesFramework (480.30.2 - 480.30.2) <251D047D-D79A-3300-8DFC-D6D6D4D0015D> /System/Library/PrivateFrameworks/DiskImages.framework/Versions/A/DiskImages
+    0x7fff420d9000 -     0x7fff42150ff7  com.apple.DiskManagement (11.2 - 1339) <0B17E79A-0BF6-3FD8-8AD0-A8498545030F> /System/Library/PrivateFrameworks/DiskManagement.framework/Versions/A/DiskManagement
+    0x7fff42151000 -     0x7fff4215cff7  com.apple.DisplayServicesFW (3.1 - 380) <FB1FBB24-7FD5-3B57-8D3C-39F953F8A9BB> /System/Library/PrivateFrameworks/DisplayServices.framework/Versions/A/DisplayServices
+    0x7fff421e4000 -     0x7fff421e6ff7  com.apple.EFILogin (2.0 - 2) <5B6E5A73-C2B2-3188-ADE9-C29CE29BB225> /System/Library/PrivateFrameworks/EFILogin.framework/Versions/A/EFILogin
+    0x7fff42932000 -     0x7fff4294afff  com.apple.Engram (1.0 - 1) <93DC8AE3-B3F7-326E-93DB-C85A2BFD3C3F> /System/Library/PrivateFrameworks/Engram.framework/Versions/A/Engram
+    0x7fff42c88000 -     0x7fff430b6fff  com.apple.vision.FaceCore (3.3.2 - 3.3.2) <80C97AD7-D5C2-311A-B268-4AA60CAD6CED> /System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore
+    0x7fff44d1e000 -     0x7fff44d1efff  libmetal_timestamp.dylib (802.3.14) <D2CD48A8-5989-32AC-B64B-76E29D4E2449> /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/3802/Libraries/libmetal_timestamp.dylib
+    0x7fff4637e000 -     0x7fff46389ff7  libGPUSupportMercury.dylib (16.4.2) <F5BA5D7A-FD23-3416-B9B3-7EABFD4279D5> /System/Library/PrivateFrameworks/GPUSupport.framework/Versions/A/Libraries/libGPUSupportMercury.dylib
+    0x7fff46726000 -     0x7fff4674bff3  com.apple.GenerationalStorage (2.0 - 285) <07E7BC5F-8EF2-34FC-9EEC-B4E61EAAFA9A> /System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage
+    0x7fff46763000 -     0x7fff47087fff  com.apple.GeoServices (1.0 - 1359.22.9.1.19) <0D30FD8E-BAED-3383-AF27-965D3A09B05E> /System/Library/PrivateFrameworks/GeoServices.framework/Versions/A/GeoServices
+    0x7fff470ca000 -     0x7fff470d9fff  com.apple.GraphVisualizer (1.0 - 5) <0A93C5DE-0D28-312E-8764-6B0FB805ED91> /System/Library/PrivateFrameworks/GraphVisualizer.framework/Versions/A/GraphVisualizer
+    0x7fff47151000 -     0x7fff471c5fff  com.apple.Heimdal (4.0 - 2.0) <ACC132E5-97F1-3B36-AD7B-4E6CC077E691> /System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal
+    0x7fff4725f000 -     0x7fff47371ff3  com.apple.ids (10.0 - 1000) <3BAA60B0-8F63-3570-B276-01EF45B9B4DF> /System/Library/PrivateFrameworks/IDS.framework/Versions/A/IDS
+    0x7fff47372000 -     0x7fff47450ff3  com.apple.idsfoundation (10.0 - 1000) <22E80DC0-4246-3B6B-903F-D1D191E615F8> /System/Library/PrivateFrameworks/IDSFoundation.framework/Versions/A/IDSFoundation
+    0x7fff47957000 -     0x7fff479bdff3  com.apple.imfoundation (10.0 - 1000) <32799DD1-91A2-3093-8D8C-4F4988560FC2> /System/Library/PrivateFrameworks/IMFoundation.framework/Versions/A/IMFoundation
+    0x7fff47a77000 -     0x7fff47a7effb  com.apple.IOAccelerator (376.6 - 376.6) <A47129CC-F386-3C31-AD66-C19A70615A50> /System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator
+    0x7fff47a82000 -     0x7fff47a99fff  com.apple.IOPresentment (1.0 - 32.1) <B95F06EA-9D5D-311D-9912-978AE42ECFCE> /System/Library/PrivateFrameworks/IOPresentment.framework/Versions/A/IOPresentment
+    0x7fff47e63000 -     0x7fff47e88fff  com.apple.IconServices (97.4 - 97.4) <C84A6CA5-8C50-3288-8572-CC3DABF5BBCE> /System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices
+    0x7fff47f92000 -     0x7fff47f95ff3  com.apple.InternationalSupport (1.0 - 1) <5AB382FD-BF81-36A1-9565-61F1FD398ECA> /System/Library/PrivateFrameworks/InternationalSupport.framework/Versions/A/InternationalSupport
+    0x7fff48003000 -     0x7fff48013ffb  com.apple.IntlPreferences (2.0 - 227) <0FF7209B-0E4D-3411-B325-03938B7C0938> /System/Library/PrivateFrameworks/IntlPreferences.framework/Versions/A/IntlPreferences
+    0x7fff4811d000 -     0x7fff48212fff  com.apple.LanguageModeling (1.0 - 159.3.1) <9B08E18E-69B4-3413-A03A-EF5AE4BE6277> /System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling
+    0x7fff48213000 -     0x7fff48255ff7  com.apple.Lexicon-framework (1.0 - 33.2) <5CC5E8EE-62A1-3EA5-B300-A39ABD0CF12D> /System/Library/PrivateFrameworks/Lexicon.framework/Versions/A/Lexicon
+    0x7fff48259000 -     0x7fff48260ff7  com.apple.LinguisticData (1.0 - 238.3) <228AF7CA-649A-3E24-BBC7-8A24B39B3FC4> /System/Library/PrivateFrameworks/LinguisticData.framework/Versions/A/LinguisticData
+    0x7fff48347000 -     0x7fff4834cfff  com.apple.LoginUICore (4.0 - 4.0) <A5F2EF2E-0999-376D-83EF-1B66171C5723> /System/Library/PrivateFrameworks/LoginUIKit.framework/Versions/A/Frameworks/LoginUICore.framework/Versions/A/LoginUICore
+    0x7fff48398000 -     0x7fff483b5ff3  com.apple.LookupFramework (1.2 - 239) <ACECB15D-1C21-3D3D-A4C5-F9736090E741> /System/Library/PrivateFrameworks/Lookup.framework/Versions/A/Lookup
+    0x7fff48a84000 -     0x7fff48a87fff  com.apple.Mangrove (1.0 - 1) <13832222-8A6B-3790-8914-BE874B5ED4DD> /System/Library/PrivateFrameworks/Mangrove.framework/Versions/A/Mangrove
+    0x7fff48b10000 -     0x7fff48b12ff7  com.apple.marco (10.0 - 1000) <86E99D5C-D56D-3874-B465-833A9B40DE88> /System/Library/PrivateFrameworks/Marco.framework/Versions/A/Marco
+    0x7fff48ba0000 -     0x7fff48bd3ff7  com.apple.MediaKit (16 - 871) <47A5B872-4139-315D-A047-581F9C485D15> /System/Library/PrivateFrameworks/MediaKit.framework/Versions/A/MediaKit
+    0x7fff48bd4000 -     0x7fff48e18ff7  com.apple.MediaRemote (1.0 - 1) <ADDC2917-76C0-3F07-8DBF-746C9CA6A9BE> /System/Library/PrivateFrameworks/MediaRemote.framework/Versions/A/MediaRemote
+    0x7fff48e19000 -     0x7fff48e38ff3  com.apple.MediaServices (1.0 - 1) <2CA740A6-7E26-3865-8A5B-C2912665D01C> /System/Library/PrivateFrameworks/MediaServices.framework/Versions/A/MediaServices
+    0x7fff48eac000 -     0x7fff48f15ff7  com.apple.gpusw.MetalTools (1.0 - 1) <F77943BC-0466-3700-BEDF-CDD13125D36A> /System/Library/PrivateFrameworks/MetalTools.framework/Versions/A/MetalTools
+    0x7fff48f1d000 -     0x7fff48f32ff3  com.apple.MobileAssets (1.0 - 437.30.17) <9C014350-D76E-3143-ACFF-F3D1B2668988> /System/Library/PrivateFrameworks/MobileAsset.framework/Versions/A/MobileAsset
+    0x7fff49089000 -     0x7fff490a1ff3  com.apple.MobileKeyBag (2.0 - 1.0) <170AD2F3-9D3E-3FF6-BA02-60C48C1E6724> /System/Library/PrivateFrameworks/MobileKeyBag.framework/Versions/A/MobileKeyBag
+    0x7fff4912d000 -     0x7fff49155fff  com.apple.MultitouchSupport.framework (1204.13 - 1204.13) <6C5D778D-4AB7-39A4-989B-2E8D2D57B3A0> /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport
+    0x7fff493ba000 -     0x7fff493c5fff  com.apple.NetAuth (6.2 - 6.2) <5C6F492A-28EF-3A0E-B573-6F3D60CFF0C7> /System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth
+    0x7fff493d2000 -     0x7fff4949fff7  com.apple.Network (1.0 - 1) <3C391F45-3801-3C27-8D89-FDE554156CDD> /System/Library/PrivateFrameworks/Network.framework/Versions/A/Network
+    0x7fff4abc7000 -     0x7fff4ac07ffb  com.apple.PerformanceAnalysis (1.183.1 - 183.1) <2BE359F2-DCE6-3E33-BA99-964507A3F540> /System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis
+    0x7fff4ac7f000 -     0x7fff4ac7fff7  com.apple.PhoneNumbers (1.0 - 1) <DB9AC990-BA10-3BAC-8109-3C71E9D45BE2> /System/Library/PrivateFrameworks/PhoneNumbers.framework/Versions/A/PhoneNumbers
+    0x7fff4c66b000 -     0x7fff4c690fff  com.apple.pluginkit.framework (1.0 - 1) <D627D78B-BEDA-3E53-B5F8-B3805F1C4D2A> /System/Library/PrivateFrameworks/PlugInKit.framework/Versions/A/PlugInKit
+    0x7fff4c98f000 -     0x7fff4c9e2fff  com.apple.ProtectedCloudStorage (1.0 - 1) <8C4D5271-406F-3455-88FA-995A95D6D4A1> /System/Library/PrivateFrameworks/ProtectedCloudStorage.framework/Versions/A/ProtectedCloudStorage
+    0x7fff4c9e3000 -     0x7fff4ca01fff  com.apple.ProtocolBuffer (1 - 259) <D047A3FE-C7A8-3CAA-9891-6232BA88C247> /System/Library/PrivateFrameworks/ProtocolBuffer.framework/Versions/A/ProtocolBuffer
+    0x7fff4cb6e000 -     0x7fff4cb83ff3  com.apple.QuickLookThumbnailing (1.0 - 1) <0771325B-BBAD-3865-B2A3-BE7089641C52> /System/Library/PrivateFrameworks/QuickLookThumbnailing.framework/Versions/A/QuickLookThumbnailing
+    0x7fff4cb84000 -     0x7fff4cb8cff3  com.apple.RTCReporting (9.32.35.1 - 9.32.35.1) <A62555BF-C5C0-3CD8-BBFA-DB6D0F25722B> /System/Library/PrivateFrameworks/RTCReporting.framework/Versions/A/RTCReporting
+    0x7fff4cbd5000 -     0x7fff4cbe0fff  com.apple.xpc.RemoteServiceDiscovery (1.0 - 1205.30.29) <E2AEA0D7-23E6-3198-96EF-2F1F8ACD98B4> /System/Library/PrivateFrameworks/RemoteServiceDiscovery.framework/Versions/A/RemoteServiceDiscovery
+    0x7fff4cbe1000 -     0x7fff4cc04ffb  com.apple.RemoteViewServices (2.0 - 125) <AEDBCE8C-88B7-315A-9F81-3E068F0D3EDC> /System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices
+    0x7fff4cc05000 -     0x7fff4cc16ffb  com.apple.xpc.RemoteXPC (1.0 - 1205.30.29) <1FD53EC6-A9E9-3AEC-86A7-C52729D1A135> /System/Library/PrivateFrameworks/RemoteXPC.framework/Versions/A/RemoteXPC
+    0x7fff4e51d000 -     0x7fff4e62dff7  com.apple.Sharing (972.6 - 972.6) <2F72F828-7A05-345F-8ABA-1EDADACA4D57> /System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing
+    0x7fff4e657000 -     0x7fff4e658fff  com.apple.performance.SignpostNotification (1.0 - 1) <D4C967BA-92C6-3BAB-AFB5-59F98B35F921> /System/Library/PrivateFrameworks/SignpostNotification.framework/Versions/A/SignpostNotification
+    0x7fff4f355000 -     0x7fff4f5effff  com.apple.SkyLight (1.600.0 - 312.23.4) <390012E0-39E3-3D18-8271-D447990FDD21> /System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/SkyLight
+    0x7fff4fda0000 -     0x7fff4fdadff7  com.apple.SpeechRecognitionCore (4.0.13 - 4.0.13) <AC026FB9-78F8-31F9-BB80-619D5378DB70> /System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore
+    0x7fff50246000 -     0x7fff5026dff7  com.apple.StreamingZip (1.0 - 1) <F06F4CDC-138C-3991-A987-7C7332BE4508> /System/Library/PrivateFrameworks/StreamingZip.framework/Versions/A/StreamingZip
+    0x7fff5093f000 -     0x7fff509c3fe7  com.apple.Symbolication (9.0 - 63079.1) <177BC9CA-E6AE-3B40-806F-0080C0CDFF29> /System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication
+    0x7fff50c85000 -     0x7fff50cb1fff  com.apple.framework.SystemAdministration (1.0 - 1.0) <6AE03DE8-E5C1-38E5-B788-0A763CAACDC2> /System/Library/PrivateFrameworks/SystemAdministration.framework/Versions/A/SystemAdministration
+    0x7fff50eb4000 -     0x7fff50ebbff3  com.apple.TCC (1.0 - 1) <C807D3F0-FE20-3FC0-8D61-306477ABEBC4> /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC
+    0x7fff510c8000 -     0x7fff51185ff7  com.apple.TextureIO (3.7 - 3.7) <C98BFACA-7807-3DCA-945D-58EBA2B723C8> /System/Library/PrivateFrameworks/TextureIO.framework/Versions/A/TextureIO
+    0x7fff511d6000 -     0x7fff511f1ffb  com.apple.ToneKit (1.0 - 1) <A0242052-983B-3726-B5BD-D2E672CEFE2F> /System/Library/PrivateFrameworks/ToneKit.framework/Versions/A/ToneKit
+    0x7fff511f2000 -     0x7fff51219fff  com.apple.ToneLibrary (1.0 - 1) <7EEABD7F-D0CB-327E-A772-ACF406B9C8F2> /System/Library/PrivateFrameworks/ToneLibrary.framework/Versions/A/ToneLibrary
+    0x7fff51229000 -     0x7fff5122afff  com.apple.TrustEvaluationAgent (2.0 - 31) <39F533B2-211E-3635-AF47-23F27749FF4A> /System/Library/PrivateFrameworks/TrustEvaluationAgent.framework/Versions/A/TrustEvaluationAgent
+    0x7fff51230000 -     0x7fff513dfff3  com.apple.UIFoundation (1.0 - 546.1.1) <2B50EBBC-9221-31BC-92A9-7ED0A4A46E2D> /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation
+    0x7fff520a8000 -     0x7fff52177ff7  com.apple.ViewBridge (343.2 - 343.2) <DD3D1ED5-DF9E-3C48-8897-0B84B0AD2377> /System/Library/PrivateFrameworks/ViewBridge.framework/Versions/A/ViewBridge
+    0x7fff5253c000 -     0x7fff52762ff7  libAWDSupportFramework.dylib (749.13) <B8711178-CE8C-3786-A269-E83710A1B71D> /System/Library/PrivateFrameworks/WirelessDiagnostics.framework/Versions/A/Libraries/libAWDSupportFramework.dylib
+    0x7fff52763000 -     0x7fff52774fff  libprotobuf-lite.dylib (749.13) <9344E035-93AA-3197-8033-93348005AFF5> /System/Library/PrivateFrameworks/WirelessDiagnostics.framework/Versions/A/Libraries/libprotobuf-lite.dylib
+    0x7fff52775000 -     0x7fff527d7fff  libprotobuf.dylib (749.13) <EA5D182D-2E4B-3DF3-BEED-ADEF1FE4EBC5> /System/Library/PrivateFrameworks/WirelessDiagnostics.framework/Versions/A/Libraries/libprotobuf.dylib
+    0x7fff527d8000 -     0x7fff5281bff7  com.apple.awd (1.0 - 919) <60D12A36-C579-348F-B84C-E25F20C422E0> /System/Library/PrivateFrameworks/WirelessDiagnostics.framework/Versions/A/WirelessDiagnostics
+    0x7fff52b22000 -     0x7fff52b24ffb  com.apple.loginsupport (1.0 - 1) <5E2C4AA7-066D-3FDB-B0E1-4CDAF287392C> /System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport
+    0x7fff52b25000 -     0x7fff52b3afff  com.apple.login (3.0 - 3.0) <140118A7-8FB9-35C5-92FA-BD79C9C32309> /System/Library/PrivateFrameworks/login.framework/Versions/A/login
+    0x7fff52b65000 -     0x7fff52b92fff  com.apple.contacts.vCard (1.0 - 2330.3) <02AB9DF0-0471-3FDA-8EC6-27C72E00DD75> /System/Library/PrivateFrameworks/vCard.framework/Versions/A/vCard
+    0x7fff52c88000 -     0x7fff52cbbfff  libclosured.dylib (519.2.2) <48051216-5647-3643-B979-B77D0FD20011> /usr/lib/closure/libclosured.dylib
+    0x7fff52d5b000 -     0x7fff52d94ff7  libCRFSuite.dylib (41) <AB2DA745-F22C-30CF-81D4-35DD716463B8> /usr/lib/libCRFSuite.dylib
+    0x7fff52d95000 -     0x7fff52da0fff  libChineseTokenizer.dylib (28) <D30A7DB6-058F-3286-9583-60C9EEB77A6E> /usr/lib/libChineseTokenizer.dylib
+    0x7fff52da1000 -     0x7fff52e2eff7  libCoreStorage.dylib (546) <B495D87B-FE21-3C14-9017-F02D9CA226D5> /usr/lib/libCoreStorage.dylib
+    0x7fff52e32000 -     0x7fff52e33ff3  libDiagnosticMessagesClient.dylib (104) <9712E980-76EE-3A89-AEA6-DF4BAF5C0574> /usr/lib/libDiagnosticMessagesClient.dylib
+    0x7fff52e6a000 -     0x7fff53034ff3  libFosl_dynamic.dylib (17.7) <B2476843-7FA7-3E62-B79F-2B15FE557E63> /usr/lib/libFosl_dynamic.dylib
+    0x7fff5306c000 -     0x7fff5306cfff  libOpenScriptingUtil.dylib (174) <203D2C39-61BB-3713-A502-2D17B04A42AC> /usr/lib/libOpenScriptingUtil.dylib
+    0x7fff53195000 -     0x7fff53199ffb  libScreenReader.dylib (562.13) <21638ECC-87BF-3CC5-B2D8-6F7883F5FDCA> /usr/lib/libScreenReader.dylib
+    0x7fff5319a000 -     0x7fff5319bff3  libSystem.B.dylib (1252) <5EDEEA85-0387-31EE-9D9B-DA1B75E7AEF3> /usr/lib/libSystem.B.dylib
+    0x7fff5319c000 -     0x7fff53219fff  libTelephonyUtilDynamic.dylib (3086.2) <47109727-F31F-3777-BD41-1DED1B8C96DC> /usr/lib/libTelephonyUtilDynamic.dylib
+    0x7fff5321a000 -     0x7fff5321bfff  libThaiTokenizer.dylib (2.2) <04AC7CD4-BD9A-3B1D-8CEB-9E2030B6B667> /usr/lib/libThaiTokenizer.dylib
+    0x7fff5322e000 -     0x7fff5322efff  libapple_crypto.dylib (109.30.8) <E0162198-C97F-3286-9FF7-254D23F6FD04> /usr/lib/libapple_crypto.dylib
+    0x7fff5322f000 -     0x7fff53245ff7  libapple_nghttp2.dylib (1.24) <01402BC4-4822-3676-9C80-50D83F816424> /usr/lib/libapple_nghttp2.dylib
+    0x7fff53246000 -     0x7fff53270ff3  libarchive.2.dylib (54) <8FC28DD8-E315-3C3E-95FE-D1D2CBE49888> /usr/lib/libarchive.2.dylib
+    0x7fff53271000 -     0x7fff532f2fdf  libate.dylib (1.13.1) <178ACDAD-DE7E-346C-A613-1CBF7929AC07> /usr/lib/libate.dylib
+    0x7fff532f6000 -     0x7fff532f6ff3  libauto.dylib (187) <A05C7900-F8C7-3E75-8D3F-909B40C19717> /usr/lib/libauto.dylib
+    0x7fff532f7000 -     0x7fff533aeff7  libboringssl.dylib (109.30.8) <E62E3E83-BA8A-3CCE-8E71-84FB184FBBB5> /usr/lib/libboringssl.dylib
+    0x7fff533af000 -     0x7fff533bfff3  libbsm.0.dylib (39) <770B341F-3BB7-3123-B53C-F2D58868A963> /usr/lib/libbsm.0.dylib
+    0x7fff533c0000 -     0x7fff533cdffb  libbz2.1.0.dylib (38) <0A5086BB-4724-3C14-979D-5AD4F26B5B45> /usr/lib/libbz2.1.0.dylib
+    0x7fff533ce000 -     0x7fff53424fff  libc++.1.dylib (400.9) <FCF5E1F6-2B04-3545-8004-F3AB32FED172> /usr/lib/libc++.1.dylib
+    0x7fff53425000 -     0x7fff53449ff7  libc++abi.dylib (400.7) <217656D5-BC40-37FF-B322-91CB2AAD4F34> /usr/lib/libc++abi.dylib
+    0x7fff5344b000 -     0x7fff5345bfff  libcmph.dylib (6) <A5509EE8-7E00-3224-8814-015B077A3CF5> /usr/lib/libcmph.dylib
+    0x7fff5345c000 -     0x7fff53472fff  libcompression.dylib (47) <E64D4416-DFBF-314B-BBB9-BED23C3A251C> /usr/lib/libcompression.dylib
+    0x7fff5371f000 -     0x7fff53737ff7  libcoretls.dylib (155) <DFE2454F-2FE3-3B2B-A22B-422947C34C69> /usr/lib/libcoretls.dylib
+    0x7fff53738000 -     0x7fff53739ffb  libcoretls_cfhelpers.dylib (155) <D3F4B882-40C1-3CD4-927B-0E0ED6031D0B> /usr/lib/libcoretls_cfhelpers.dylib
+    0x7fff538d2000 -     0x7fff53a62fff  libcrypto.35.dylib (22) <067CFC21-249D-392D-ADE1-785100BF0F83> /usr/lib/libcrypto.35.dylib
+    0x7fff53bfd000 -     0x7fff53c08ff7  libcsfde.dylib (546) <B6F6340A-F874-38BD-A7BB-FFADEBA54789> /usr/lib/libcsfde.dylib
+    0x7fff53c09000 -     0x7fff53c5fff3  libcups.2.dylib (462.1) <B78448A0-9C97-3D4A-823E-EBE37B2B7CA6> /usr/lib/libcups.2.dylib
+    0x7fff53c8a000 -     0x7fff53cdeffb  libcurl.4.dylib (105.30.2) <DB7326B0-DE38-392D-AAFA-E81BE0EDE99E> /usr/lib/libcurl.4.dylib
+    0x7fff53ce1000 -     0x7fff53ce8ff3  libdscsym.dylib (183.1) <2DE012BF-CE9A-3BDF-9A2D-55D66B51AA35> /usr/lib/libdscsym.dylib
+    0x7fff53d9d000 -     0x7fff53d9dfff  libenergytrace.dylib (16) <A92AB8B8-B986-3CE6-980D-D55090FEF387> /usr/lib/libenergytrace.dylib
+    0x7fff53dcf000 -     0x7fff53dd3ff7  libgermantok.dylib (17) <379C5DC6-BEDB-378D-B09C-A63D297EAA6D> /usr/lib/libgermantok.dylib
+    0x7fff53dd4000 -     0x7fff53dd9ff3  libheimdal-asn1.dylib (520.30.1) <14DC1451-6E22-3A48-80CB-5D33DC0F8C3B> /usr/lib/libheimdal-asn1.dylib
+    0x7fff53e05000 -     0x7fff53ef6ff7  libiconv.2.dylib (51) <0772997F-4109-38A1-91ED-0F3F16AE99E5> /usr/lib/libiconv.2.dylib
+    0x7fff53ef7000 -     0x7fff5411effb  libicucore.A.dylib (59152.0.1) <281C39FD-0C9A-3EB2-A407-36D4CCE938E5> /usr/lib/libicucore.A.dylib
+    0x7fff5416b000 -     0x7fff5416cfff  liblangid.dylib (128) <39C39393-0D05-301D-93B2-F224FC4949AA> /usr/lib/liblangid.dylib
+    0x7fff5416d000 -     0x7fff54186ffb  liblzma.5.dylib (10) <3D419A50-961F-37D2-8A01-3DC7AB7B8D18> /usr/lib/liblzma.5.dylib
+    0x7fff54187000 -     0x7fff5419dff7  libmarisa.dylib (9) <D6D2D55D-1D2E-3442-B152-B18803C0ABB4> /usr/lib/libmarisa.dylib
+    0x7fff5419e000 -     0x7fff5424dfff  libmecab.1.0.0.dylib (779.7.6) <F179766A-0448-37A6-9AD0-99E2FF2C0AD9> /usr/lib/libmecab.1.0.0.dylib
+    0x7fff5424e000 -     0x7fff54476ff7  libmecabra.dylib (779.7.6) <7808C544-161E-37CE-9D42-F368C82A180D> /usr/lib/libmecabra.dylib
+    0x7fff5464e000 -     0x7fff54725ffb  libnetwork.dylib (1229.30.11) <2A9846DE-C063-3340-89D1-D5DAC2B8A08A> /usr/lib/libnetwork.dylib
+    0x7fff5479b000 -     0x7fff54b897e7  libobjc.A.dylib (723) <93A92316-DE1E-378C-8891-99720B50D075> /usr/lib/libobjc.A.dylib
+    0x7fff54b8a000 -     0x7fff54b8bff7  libodfde.dylib (24) <1BBC519E-EF89-38F3-B226-70F086670D0F> /usr/lib/libodfde.dylib
+    0x7fff54b9c000 -     0x7fff54ba0fff  libpam.2.dylib (22) <7B4D2CE2-1438-387A-9802-5CEEFBF26F86> /usr/lib/libpam.2.dylib
+    0x7fff54ba3000 -     0x7fff54bd7fff  libpcap.A.dylib (79.20.1) <FA13918B-A247-3181-B256-9B852C7BA316> /usr/lib/libpcap.A.dylib
+    0x7fff54c56000 -     0x7fff54c72ffb  libresolv.9.dylib (65) <E8F3415B-4472-3202-8901-41FD87981DB2> /usr/lib/libresolv.9.dylib
+    0x7fff54cad000 -     0x7fff54cbffff  libsasl2.2.dylib (211) <D9E281A2-D7BA-32CD-8B96-54972B1D9E66> /usr/lib/libsasl2.2.dylib
+    0x7fff54cc0000 -     0x7fff54cc1ff7  libspindump.dylib (248) <12E8B8BA-072F-39AE-8BC9-7D5840DA80EB> /usr/lib/libspindump.dylib
+    0x7fff54cc2000 -     0x7fff54e55fe7  libsqlite3.dylib (274.5) <A1DEB5AB-8FE8-332E-A7E5-F493F2223FE3> /usr/lib/libsqlite3.dylib
+    0x7fff54eb1000 -     0x7fff54f04ffb  libssl.35.dylib (22) <4D77B502-E065-3794-90E7-39E83F9683F6> /usr/lib/libssl.35.dylib
+    0x7fff54fac000 -     0x7fff54fbcff7  libsystemstats.dylib (403.31.1) <9FE5E908-88F1-3593-ADCD-4BC78100DA68> /usr/lib/libsystemstats.dylib
+    0x7fff54fd9000 -     0x7fff5500efff  libtidy.A.dylib (15.18.1) <3E33A53A-53AB-3FD5-BBAB-DFA6A3A90132> /usr/lib/libtidy.A.dylib
+    0x7fff55026000 -     0x7fff5505ffff  libusrtcp.dylib (1229.30.11) <537F14D0-84DF-349F-8EA0-52BB7A241E60> /usr/lib/libusrtcp.dylib
+    0x7fff55060000 -     0x7fff55063ffb  libutil.dylib (51.20.1) <216D18E5-0BAF-3EAF-A38E-F6AC37CBABD9> /usr/lib/libutil.dylib
+    0x7fff55064000 -     0x7fff55071fff  libxar.1.dylib (400) <0316128D-3B47-3052-995D-97B4FE5491DC> /usr/lib/libxar.1.dylib
+    0x7fff55075000 -     0x7fff5515cfff  libxml2.2.dylib (31.7) <49544596-BCF8-3765-8DC5-DB1A9A90EF92> /usr/lib/libxml2.2.dylib
+    0x7fff5515d000 -     0x7fff55185fff  libxslt.1.dylib (15.10) <66682AF6-C2D5-374C-901F-25A3E72814DC> /usr/lib/libxslt.1.dylib
+    0x7fff55186000 -     0x7fff55198ffb  libz.1.dylib (70) <48C67CFC-940D-3857-8DAD-857774605352> /usr/lib/libz.1.dylib
+    0x7fff55236000 -     0x7fff5523aff7  libcache.dylib (80) <354F3B7D-404E-3398-9EBF-65CA2CE65211> /usr/lib/system/libcache.dylib
+    0x7fff5523b000 -     0x7fff55245ff3  libcommonCrypto.dylib (60118.30.2) <674286D3-7744-36A3-9AAA-49DFCD97A986> /usr/lib/system/libcommonCrypto.dylib
+    0x7fff55246000 -     0x7fff5524dfff  libcompiler_rt.dylib (62) <4487CFBA-A5D7-3282-9E6B-94CAD7BE507E> /usr/lib/system/libcompiler_rt.dylib
+    0x7fff5524e000 -     0x7fff55256ffb  libcopyfile.dylib (146.30.2) <2C7C67D7-562B-3FFA-973D-BACF4C10E1EC> /usr/lib/system/libcopyfile.dylib
+    0x7fff55257000 -     0x7fff552dcfff  libcorecrypto.dylib (562.30.10) <8A53EFE1-AFCA-3676-BEE1-FA5ED9F0E222> /usr/lib/system/libcorecrypto.dylib
+    0x7fff55364000 -     0x7fff5539dff7  libdispatch.dylib (913.30.4) <7D0E3183-282B-3FEE-A734-2C0ADC092084> /usr/lib/system/libdispatch.dylib
+    0x7fff5539e000 -     0x7fff553bbff7  libdyld.dylib (519.2.2) <C50D02BC-A333-3313-B787-02F255A6783F> /usr/lib/system/libdyld.dylib
+    0x7fff553bc000 -     0x7fff553bcffb  libkeymgr.dylib (28) <6D84A96F-C65B-38EC-BDB5-21FD2C97E7B2> /usr/lib/system/libkeymgr.dylib
+    0x7fff553bd000 -     0x7fff553c9ff3  libkxld.dylib (4570.31.3) <C0DBCF74-E669-3AAD-934F-F07F3FE32908> /usr/lib/system/libkxld.dylib
+    0x7fff553ca000 -     0x7fff553caff7  liblaunch.dylib (1205.30.29) <E66F58ED-C15E-3DFB-BC22-A861E13918C6> /usr/lib/system/liblaunch.dylib
+    0x7fff553cb000 -     0x7fff553cfffb  libmacho.dylib (900.0.1) <756F2553-07B6-3B42-ACEA-2F0F1A5E8D0F> /usr/lib/system/libmacho.dylib
+    0x7fff553d0000 -     0x7fff553d2ff3  libquarantine.dylib (86) <6AC8773F-3817-3D82-99C2-01BABB9C3CBB> /usr/lib/system/libquarantine.dylib
+    0x7fff553d3000 -     0x7fff553d4ff3  libremovefile.dylib (45) <912FA211-DD8C-3C92-8424-21B89F8B10FD> /usr/lib/system/libremovefile.dylib
+    0x7fff553d5000 -     0x7fff553ecfff  libsystem_asl.dylib (356.1.1) <94972913-9DF0-3C78-847C-43E58919E3DA> /usr/lib/system/libsystem_asl.dylib
+    0x7fff553ed000 -     0x7fff553edfff  libsystem_blocks.dylib (67) <F2493BB5-B1C6-3C4D-9F1F-1B402E0F1DB7> /usr/lib/system/libsystem_blocks.dylib
+    0x7fff553ee000 -     0x7fff55477ff7  libsystem_c.dylib (1244.30.3) <E0136C71-0648-36F0-9F84-82EA2748A8D7> /usr/lib/system/libsystem_c.dylib
+    0x7fff55478000 -     0x7fff5547bffb  libsystem_configuration.dylib (963.30.1) <0F8D0B76-4F7D-34EC-AB6C-50F9465809DA> /usr/lib/system/libsystem_configuration.dylib
+    0x7fff5547c000 -     0x7fff5547fffb  libsystem_coreservices.dylib (51) <21A488D0-2D07-344E-8631-CC8B2A246F35> /usr/lib/system/libsystem_coreservices.dylib
+    0x7fff55480000 -     0x7fff55481fff  libsystem_darwin.dylib (1244.30.3) <2F750CB1-BC26-3FA3-AE59-553EE30D451B> /usr/lib/system/libsystem_darwin.dylib
+    0x7fff55482000 -     0x7fff55488ff7  libsystem_dnssd.dylib (878.30.4) <EB9BB165-45A4-367C-B33A-688D4F383A95> /usr/lib/system/libsystem_dnssd.dylib
+    0x7fff55489000 -     0x7fff554d2ff7  libsystem_info.dylib (517.30.1) <7D79E167-4B5C-3833-81EE-3AF3FB53616D> /usr/lib/system/libsystem_info.dylib
+    0x7fff554d3000 -     0x7fff554f8ff7  libsystem_kernel.dylib (4570.31.3) <D2E842AA-3B8D-31BF-8234-8C1BE11CFE32> /usr/lib/system/libsystem_kernel.dylib
+    0x7fff554f9000 -     0x7fff55544fcb  libsystem_m.dylib (3146) <ABB1B85F-9FFE-31B8-AD4F-E39A30794A93> /usr/lib/system/libsystem_m.dylib
+    0x7fff55545000 -     0x7fff55564fff  libsystem_malloc.dylib (140.1.1) <9F0745FF-B92F-330D-8812-BB74001D1D33> /usr/lib/system/libsystem_malloc.dylib
+    0x7fff55565000 -     0x7fff55609ff3  libsystem_network.dylib (1229.30.11) <40BAD301-8744-3AD8-A688-E7925C587B00> /usr/lib/system/libsystem_network.dylib
+    0x7fff5560a000 -     0x7fff55614ffb  libsystem_networkextension.dylib (767.30.7) <C5ED4BAB-2480-369D-8AB6-DFB37C15A1EE> /usr/lib/system/libsystem_networkextension.dylib
+    0x7fff55615000 -     0x7fff5561eff3  libsystem_notify.dylib (172) <98EA3D62-7C86-30DE-8261-D020D2F1EFF3> /usr/lib/system/libsystem_notify.dylib
+    0x7fff5561f000 -     0x7fff55626ff7  libsystem_platform.dylib (161.20.1) <C049250F-8C35-314D-810F-4E28AEAED983> /usr/lib/system/libsystem_platform.dylib
+    0x7fff55627000 -     0x7fff55632fff  libsystem_pthread.dylib (301.30.1) <ABA848E1-6978-3B42-A3A7-608B2C36FA93> /usr/lib/system/libsystem_pthread.dylib
+    0x7fff55633000 -     0x7fff55636ff3  libsystem_sandbox.dylib (765.30.4) <A51828BA-26D8-3205-AF3A-DF5C37269468> /usr/lib/system/libsystem_sandbox.dylib
+    0x7fff55637000 -     0x7fff55638ff3  libsystem_secinit.dylib (30) <F06ADB8F-9E94-34A7-B3C9-2C22FDD14BAD> /usr/lib/system/libsystem_secinit.dylib
+    0x7fff55639000 -     0x7fff55640ff7  libsystem_symptoms.dylib (820.30.7) <DC3586C2-AA56-3419-88D3-FC0DBF08E3C0> /usr/lib/system/libsystem_symptoms.dylib
+    0x7fff55641000 -     0x7fff55654ff7  libsystem_trace.dylib (829.30.14) <69EBF017-D40F-30D7-9B0B-BFC862D761A5> /usr/lib/system/libsystem_trace.dylib
+    0x7fff55656000 -     0x7fff5565bff7  libunwind.dylib (35.3) <6D4FCD49-D2A9-3233-95C7-A7635CE265F2> /usr/lib/system/libunwind.dylib
+    0x7fff5565c000 -     0x7fff55688ff7  libxpc.dylib (1205.30.29) <F7E5F1BC-614B-39CB-B6CE-92A9C7B7EC0B> /usr/lib/system/libxpc.dylib
+
+External Modification Summary:
+  Calls made by other processes targeting this process:
+    task_for_pid: 1
+    thread_create: 0
+    thread_set_state: 0
+  Calls made by this process:
+    task_for_pid: 0
+    thread_create: 0
+    thread_set_state: 0
+  Calls made by all processes on this machine:
+    task_for_pid: 168737
+    thread_create: 0
+    thread_set_state: 387
+
+VM Region Summary:
+ReadOnly portion of Libraries: Total=456.2M resident=0K(0%) swapped_out_or_unallocated=456.2M(100%)
+Writable regions: Total=432.3M written=0K(0%) resident=0K(0%) swapped_out=0K(0%) unallocated=432.3M(100%)
+ 
+                                VIRTUAL   REGION 
+REGION TYPE                        SIZE    COUNT (non-coalesced) 
+===========                     =======  ======= 
+Accelerate framework               768K        7 
+Activity Tracing                   256K        2 
+CG backing stores                 1172K        4 
+CG image                          1348K      106 
+CoreAnimation                     61.6M      312 
+CoreGraphics                         8K        2 
+CoreImage                           44K        6 
+CoreUI image data                 4404K       75 
+CoreUI image file                  364K        9 
+Foundation                          28K        3 
+Image IO                          6476K      134 
+Kernel Alloc Once                    8K        2 
+MALLOC                           336.3M       94 
+MALLOC guard page                  112K       25 
+Mach message                         8K        3 
+Memory Tag 242                      12K        2 
+Memory Tag 251                      80K        4 
+SQLite page cache                 7680K        8 
+STACK GUARD                       56.0M       10 
+Stack                             12.1M       11 
+VM_ALLOCATE                        688K       22 
+__DATA                            39.4M      347 
+__FONT_DATA                          4K        2 
+__GLSLBUILTINS                    2588K        2 
+__LINKEDIT                       191.6M        9 
+__TEXT                           264.6M      346 
+__UNICODE                          560K        2 
+libnetwork                         384K       16 
+mapped file                      323.2M       46 
+shared memory                      692K       15 
+===========                     =======  ======= 
+TOTAL                              1.3G     1596 
+
+Model: MacBookPro12,1, BootROM MBP121.0171.B00, 2 processors, Intel Core i5, 2,9 GHz, 16 GB, SMC 2.28f7
+Graphics: Intel Iris Graphics 6100, Intel Iris Graphics 6100, Built-In
+Memory Module: BANK 0/DIMM0, 8 GB, DDR3, 1867 MHz, 0x02FE, 0x4544464232333241314D412D4A442D460000
+Memory Module: BANK 1/DIMM0, 8 GB, DDR3, 1867 MHz, 0x02FE, 0x4544464232333241314D412D4A442D460000
+AirPort: spairport_wireless_card_type_airport_extreme (0x14E4, 0x133), Broadcom BCM43xx 1.0 (7.77.37.5.1a3)
+Bluetooth: Version 6.0.2f2, 3 services, 18 devices, 1 incoming serial ports
+Network Service: Wi-Fi, AirPort, en0
+Serial ATA Device: APPLE SSD SM0512G, 500,28 GB
+USB Device: USB 3.0 Bus
+USB Device: Bluetooth USB Host Controller
+Thunderbolt Bus: MacBook Pro, Apple Inc., 27.1
+

docker/go/README.md

@@ -51,7 +51,7 @@ RUN cd /opt/code && \
 	tar -Jxf ${VALA_TAR}.tar.xz
 RUN cd /opt/code/${VALA_TAR}; ./configure --prefix=/usr ; make && make install
 # compile radare and bindings
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 #install Go
 

docker/go/radare2_go.docker

@@ -28,7 +28,7 @@ RUN cd /opt/code && \
 	tar -Jxf ${VALA_TAR}.tar.xz
 RUN cd /opt/code/${VALA_TAR}; ./configure --prefix=/usr ; make && make install
 # compile radare and bindings
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 #install Go
 

docker/java/java_README.md

@@ -39,7 +39,7 @@ RUN apt-get install -y python-pip jython
 RUN cd /opt/code; wget http://download.gnome.org/sources/vala/0.24/vala-0.24.0.tar.xz; tar -Jxf vala-0.24.0.tar.xz
 RUN cd /opt/code/vala-0.24.0; ./configure --prefix=/usr ; make && make install
 # compile radare
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 # Clean up APT when done.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -48,7 +48,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN cd /opt/code; wget http://download.gnome.org/sources/vala/0.24/vala-0.24.0.tar.xz; tar -Jxf vala-0.24.0.tar.xz
 RUN cd /opt/code/vala-0.24.0; ./configure --prefix=/usr ; make && make install
 # compile radare
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 
 #install oracle jre stuffs

docker/java/radare2_java.docker

@@ -23,7 +23,7 @@ RUN apt-get install -y python-pip jython
 RUN cd /opt/code; wget http://download.gnome.org/sources/vala/0.24/vala-0.24.0.tar.xz; tar -Jxf vala-0.24.0.tar.xz
 RUN cd /opt/code/vala-0.24.0; ./configure --prefix=/usr ; make && make install
 # compile radare
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 # Clean up APT when done.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -32,7 +32,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN cd /opt/code; wget http://download.gnome.org/sources/vala/0.24/vala-0.24.0.tar.xz; tar -Jxf vala-0.24.0.tar.xz
 RUN cd /opt/code/vala-0.24.0; ./configure --prefix=/usr ; make && make install
 # compile radare
-RUN cd /opt/code; git clone https://github.com/radare/radare2.git; cd radare2; ./sys/all.sh
+RUN cd /opt/code; git clone https://github.com/radareorg/radare2.git; cd radare2; ./sys/all.sh
 
 
 #install oracle jre stuffs

dwarf/Makefile

@@ -0,0 +1,23 @@
+include ../options.mk
+
+LIBDWARFPATH=../../libdwarf-code/
+LIBDWARFLIB=${LIBDWARFPATH}/libdwarf/
+EXTRA_TARGETS+=${LIBDWARFLIB}/libdwarf.a -lelf -lz
+
+CFLAGS+=$(shell pkg-config --cflags r_util)
+CFLAGS+=-I${LIBDWARFLIB}
+
+CC_COR=$(CC) -shared $(CFLAGS) -fPIC
+CC_LIB=$(LDFLAGS) $(shell pkg-config --libs r_core) $(EXTRA_TARGETS)
+
+all:
+	$(CC_COR) -O2 -o dparser.$(LIBEXT) main.c $(CC_LIB)
+
+install:
+	cp -f *.$(LIBEXT) $(R2PM_PLUGDIR)
+
+uninstall:
+	for a in *.$(LIBEXT) ; do rm -f $(R2PM_PLUGDIR)/$$a ; done
+
+clean:
+	rm -f *.$(LIBEXT)

dwarf/Readme.md

@@ -0,0 +1,52 @@
+DPARSER
+=======
+
+A r2 core plugin to read struct and its member from the DWARF structure.
+
+Requirements:
+-------------
+
+ - libdwarf (currently, it is preferred to use `r2pm -i libdwarf`)
+ - sdb
+
+Compilation:
+------------
+
+```make && make install```
+
+Usage:
+------
+
+Currently it works like a simple r2 core plugin.
+
+```
+iddi     path_to_file_having_dwarf_info
+idd      structname [offset]
+iddj     structname [offset]                // Output in JSON format
+iddv     structname.member1.submember2      // Print value of submember2 struct which is a member of member1 struct
+idda     structname.member1.submember2      // Print address of submember2 struct which is a member of member1 struct
+iddlg                                       // Print flags in r2 format for all global variables
+iddlf                                       // Print flags in r2 format for all functions
+iddd[j]  structname[.members]*              // Print C-Type declaration. Output in JSON format supported
+idddl    structname[.members]*              // Print C-Type declaration with sub structures shown
+iddt     structname[.members]*              // Print type and size
+```
+
+Known problems:
+---------------
+
++ Might fail while using with other libdwarf versions
++ Problem in compilation because of libdwarf and sdb source path
+
+Please file an issue if you find any
+
+Things to do:
+-------------
+
+ - Allow printing of array fields. For example: `struct->field[2]`
+ - Issue with setting flags for stubs (they should be named differently)
+
+License:
+--------
+
+GPL

dwarf/r2addrline.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+FILE=$1
+type addr2line > /dev/null 2>&1
+if [ $? = 0 ]; then
+	ADDRS=`objdump -d "$FILE" |grep :| grep -v 0000000| grep -v Disas|cut -d : -f1` 
+	addr2line -pa -e "$FILE" $ADDRS | sed -e 's,:,,' -e 's,^,CL ,' | grep -v '?'
+else
+	echo "Unable to find 'addr2line' executable in PATH"
+	exit 1
+fi

east/Makefile

@@ -0,0 +1,23 @@
+R2_PLUGDIR=$(shell r2 -H R2_USER_PLUGINS)
+R2_LIBEXT=$(shell r2 -H R2_LIBEXT)
+LDFLAGS=-L/opt/homebrew/lib
+
+# VFLAGS+=-gc none
+
+ifeq ($(R2_LIBEXT),)
+all:
+	@echo Cannot find r2
+else
+
+all:
+	v install --once
+	v fmt -w pdv.v main.v east
+	v -o a.c -shared pdv.v
+	LDFLAGS=$(LDFLAGS) v -o pdv.$(R2_LIBEXT) -shared pdv.v
+	install -m 0755 pdv.$(R2_LIBEXT) $(R2_PLUGDIR)
+	v $(VFLAGS) -g main.v
+	./main
+
+setup:
+	v install
+endif

east/README-2.md

@@ -0,0 +1,48 @@
+# VESIL
+
+## Description
+
+V library to provide high level analysis on top of esil
+
+## Usage
+
+See the `main.v` and run it with `make`.
+
+## Known bugs
+
+There are some r2 instances that arent killed somehow by v-r2pipe
+
+## Random
+
+```
+paπcake, [3/29/2022 7:03 PM]
+typedef struct {
+        char *name;
+        void *ref;
+} Symbol;
+
+// hook memory reads to find access to variables
+// hook register names to track transfers of symbols
+"0,rax,:="
+:= will trigger reg_write, if 'rax' is associated to a symbol then we can name that operation
+   for example if rax is associated to the symbol containing the return value of a function
+   the esil box can create that symbol and handle the function call expression like foo = call()
+   symbols can be invalidated at any time and their meaning can change backwards.
+
+using esilbox;
+
+int main() {
+        Symbol *argc = r_esil_box_symbol_new ("argc", "rbp,10,-");
+
+        EsilBox *eb = r_esil_box_new ();
+        r_esil_box_add_symbol (eb, argc);
+        r_esil_box_set_address (eb, 0x8048000);
+        do {
+                r_esil_box_step (eb);
+        } white (r_esil_box_running (eb));
+
+//      eb := esilbox.new()
+//      eb.set_address(0x80488)
+//      eb.step()
+}
+```

east/README.md

@@ -0,0 +1,12 @@
+# EAST
+
+Esil Abstract Structured Tree
+
+## Description
+
+This is a work in progress project that aims to provide work in progress
+and experimental development towards getting a decompiler on top of the
+R2 intermediate language (ESIL).
+
+The main objective of this project is to raise esil to the level where
+we can use it for decompilation, type propagation and advanced analysis.

east/east/ast.v

@@ -0,0 +1,168 @@
+module east
+
+pub enum NodeStatement {
+	_none
+	_break
+	_switch
+	_comment
+	_case
+	_block
+	_if
+	_condition
+	_symbol
+	_register
+	_string
+	_local
+	_operation // + - < > << || ...
+	_return
+	_function
+	_else
+	_for
+	_argument
+	_while
+	_dowhile
+	_call
+	_number // number
+	_goto // symbol or label
+	_label // symbol
+	_assign // dst, src
+	_oparen
+	_cparen
+}
+
+pub struct Node {
+pub mut:
+	name string
+	typ  NodeStatement
+	// typ      EsilType
+	addr     string
+	pos      int
+	parent   int
+	children []NodeIndex
+}
+
+type NodeIndex = int
+
+pub fn (mut e Program) add_name(typ NodeStatement, name string, nodes []NodeIndex) NodeIndex {
+	ni := e.new_node(name)
+	mut n := e.node(ni)
+	n.typ = typ
+	n.children = nodes
+	return ni
+}
+
+pub fn (mut e Program) add(typ NodeStatement, nodes []NodeIndex) NodeIndex {
+	return e.add_name(typ, '?', nodes)
+}
+
+pub fn (mut e Program) add_operation(name string) NodeIndex {
+	ni := e.new_node(name)
+	mut n := e.node(ni)
+	n.typ = ._operation
+	return ni
+}
+
+pub fn (mut e Program) add_block(addr string) NodeIndex {
+	ni := e.new_node(addr)
+	mut n := e.node(ni)
+	n.typ = ._block
+	return ni
+}
+
+pub fn (mut e Program) add_goto(addr string) NodeIndex {
+	ni := e.new_node(addr)
+	mut n := e.node(ni)
+	n.typ = ._goto
+	return ni
+}
+
+pub fn (mut e Program) add_return(arg string) NodeIndex {
+	ni := e.new_node(arg)
+	mut n := e.node(ni)
+	n.typ = ._return
+	return ni
+}
+
+pub fn (mut e Program) add_label(addr string) NodeIndex {
+	ni := e.new_node(addr)
+	mut n := e.node(ni)
+	n.typ = ._label
+	return ni
+}
+
+pub fn (mut e Program) add_number(addr u64) NodeIndex {
+	ni := e.new_node('$addr')
+	mut n := e.node(ni)
+	n.typ = ._number
+	return ni
+}
+
+pub fn (mut e Program) add_argument(addr u64, name string) NodeIndex {
+	ni := e.new_node('$name')
+	mut n := e.node(ni)
+	n.typ = ._argument
+	return ni
+}
+
+pub fn (mut e Program) add_symbol(addr u64, name string) NodeIndex {
+	ni := e.new_node('$name')
+	mut n := e.node(ni)
+	n.typ = ._symbol
+	return ni
+}
+
+pub fn (mut e Program) add_string(addr u64, name string) NodeIndex {
+	ni := e.new_node('$name')
+	mut n := e.node(ni)
+	n.typ = ._string
+	return ni
+}
+
+pub fn (mut e Program) new_local(addr u64, name string) NodeIndex {
+	ni := e.new_node('$name')
+	mut n := e.node(ni)
+	n.typ = ._local
+	// f := e.node(e.state().in_function)
+	return ni
+}
+
+pub fn (mut e Program) new_node(name string) NodeIndex {
+	mut n := &Node{}
+	n.parent = e.state().last_node
+	n.name = name
+	n.addr = e.pc()
+	n.pos = e.state().pos
+	e.ast.nodes << n
+	return e.ast.nodes.len - 1
+}
+
+pub fn (mut e Program) node(n int) &Node {
+	return &e.ast.nodes[n]
+}
+
+// XXX not working as expected
+pub fn (mut e Program) del_child(n int, c int) {
+	if n < 0 || n >= e.ast.nodes.len {
+		return
+	}
+	for i, _ in e.node(n).children {
+		cn := e.node(n).children[int(i)]
+		if cn == c {
+			eprintln('$cn vs $c')
+			mut nn := e.node(n)
+			if nn.children.len < 1 {
+				eprintln('delete')
+				// nn.children.delete(idx)
+			}
+			// dump(e.node(e.ast.nodes[n].children)
+			//	break
+		}
+	}
+}
+
+pub fn (mut e Program) add_child(n int, c int) {
+	e.ast.nodes[n].children << c
+}
+
+pub fn (mut e Program) new_node_condition(name string, a int, b int) {
+}

east/east/lib.v

@@ -0,0 +1,347 @@
+module east
+
+/*
+struct EsilOperation {
+	name string
+}
+*/
+
+type EsilOperationCallback = fn (e Program) bool
+
+struct EsilOperation {
+mut:
+	cb EsilOperationCallback
+}
+
+enum EsilType {
+	number
+	register
+	command
+}
+
+struct EsilState {
+mut:
+	// esil
+	pos       int
+	last_node int
+	tokens    []string
+}
+
+struct East {
+pub mut:
+	// ast
+	nodes       []Node
+	in_function int
+	find_type   NodeStatement
+}
+
+pub interface R2PipeInterface {
+	cmd(a string) string
+}
+
+// TODO: rename to Program
+struct Program {
+	a  int
+	r2 R2PipeInterface
+mut:
+	deep        int
+	stack       []string
+	stack_index []NodeIndex
+	states      []EsilState
+	ops         map[string]EsilOperation
+	// codegen
+	ast          East
+	indent_level int
+}
+
+pub fn new_program(r2 R2PipeInterface) Program {
+	mut e := Program{0, r2, 0, []string{}, []NodeIndex{}, []EsilState{}, map[string]EsilOperation{}, East{}, 0}
+	// XXX unused ops
+	e.ops['+'] = EsilOperation{fn (e Program) bool {
+		// pop 2
+		println('add')
+		return true
+	}}
+	e.ops['-'] = EsilOperation{fn (e Program) bool {
+		// pop 2
+		println('sub')
+		return true
+	}}
+	return e
+}
+
+pub fn (mut e Program) load_instruction(ni NodeIndex, addr string, expr string) NodeIndex {
+	// add label
+	return e.eval(ni, expr)
+}
+
+pub fn (mut program Program) new_statement(addr string, esil string) NodeIndex {
+	block := program.add_name(._block, addr, [])
+	program.add_child(block, program.add_name(._comment, esil, []))
+	program.add_child(block, program.add_label(addr))
+	return program.load_instruction(block, addr, esil)
+}
+
+pub fn (mut e Program) new_function(name string, statements []NodeIndex) NodeIndex {
+	return e.add_name(._function, name, statements)
+}
+
+pub fn (mut e Program) load_function(name string) NodeIndex {
+	e.load_at(name)
+	mut statements := []NodeIndex{}
+	for expr in e.r2.cmd('pief').split('\n') {
+		addr := expr.split(' ')
+		esil := if addr.len > 1 { addr[1] } else { '' }
+		statements << e.new_statement(addr[0], esil)
+	}
+	return e.new_function(name, statements)
+}
+
+pub fn (mut e Program) load_function2(name string) NodeIndex {
+	mut statements := []NodeIndex{}
+	e.load_at(name)
+	bbs := e.r2.cmd('afb@$name').trim_space()
+	for bb in bbs.split('\n') {
+		bbw := bb.split(' ')
+		addr := bbw[0]
+		mut addr_j := ''
+		mut addr_f := ''
+		for j in 0 .. bbw.len {
+			if bbw[j] == 'j' {
+				addr_j = bbw[j + 1]
+			}
+			if bbw[j] == 'f' {
+				addr_f = bbw[j + 1]
+			}
+		}
+		println('$addr -> $addr_j -> $addr_f ')
+		ni := e.add_block(addr)
+		if addr_j == '' {
+			// return basic block
+			e.add_child(ni, e.add_return(''))
+		} else if addr_f == '' {
+			// only true jump
+			e.add_child(ni, e.add_goto(addr_j))
+		} else {
+			// have true and false jumps
+			e.add_child(ni, e.add_goto(addr_j))
+			e.add_child(ni, e.add_goto(addr_f))
+		}
+		statements << ni
+	}
+	eprintln(statements)
+	return e.new_function(name, statements)
+}
+
+pub fn (mut e Program) load_at(a string) bool {
+	e.r2.cmd('aeim;ar0;aei')
+	e.r2.cmd('s $a;af;aepc $$')
+	return true
+}
+
+pub fn (mut e Program) is_operation(op string) ?EsilOperation {
+	if op in e.ops {
+		return e.ops[op]
+	}
+	return error('no op')
+}
+
+pub fn (mut e Program) step() bool {
+	expr := e.r2.cmd('aoeq@r:PC')
+	for tok in expr.split(',') {
+		println('$tok')
+		op := e.is_operation(tok) or {
+			eprintln('oops')
+			eprintln(err)
+			break
+		}
+		eprintln(op)
+	}
+	e.r2.cmd('ar PC=PC+\$l@r:PC')
+	// e.r2.cmd('aes')
+	return true
+}
+
+pub fn (mut e Program) expr(addr string) string {
+	return e.r2.cmd('aoeq@$addr').trim_space()
+}
+
+pub fn (mut e Program) find_type() EsilType {
+	s := e.state().tokens[e.state().pos]
+	// b := if s.len > 0 { s[0] } else { 0 }
+	if s != '' && s[0] >= `0` && s[0] <= `9` {
+		return .number
+	}
+	return match s {
+		'+', '-' {
+			.command
+		}
+		else {
+			.register
+		}
+	}
+}
+
+pub fn (mut e Program) find_statement_type() NodeStatement {
+	s := e.state().tokens[e.state().pos]
+	// b := if s.len > 0 { s[0] } else { 0 }
+	if s != '' && s[0] >= `0` && s[0] <= `9` {
+		return ._number
+	}
+	return match s {
+		'+', '+=', '!', '-', '|', '&', '&=', '-=', '*', '*=', '/', '%', '^', '^=', '<<', '>>',
+		'<<<', '<<<<', '>>>', '>>>>' {
+			._operation
+		}
+		'=[8]', '=[4]', '=[2]', '=[1]' {
+			._operation
+		}
+		'[8]', '[4]', '[2]', '[1]' {
+			._assign
+		}
+		'=', ':=' {
+			._assign
+		}
+		'GOTO' {
+			._goto
+		}
+		'==', '!=' {
+			._condition
+		}
+		else {
+			._symbol
+		}
+	}
+}
+
+pub fn (mut e Program) push_state() {
+	e.states << EsilState{}
+}
+
+pub fn (mut e Program) pop_state() {
+	e.states.pop()
+}
+
+pub fn (mut e Program) pop_index() NodeIndex {
+	if e.stack_index.len == 0 {
+		return 0
+	}
+	return e.stack_index.pop()
+}
+
+pub fn (mut e Program) pop() string {
+	if e.stack.len == 0 {
+		return ''
+	}
+	return e.stack.pop()
+}
+
+pub fn (mut e Program) push_index(s NodeIndex) {
+	e.stack_index << s
+}
+
+pub fn (mut e Program) push(s string) {
+	e.stack << s
+}
+
+pub fn (mut e Program) state() &EsilState {
+	if e.states.len == 0 {
+		e.push_state()
+	}
+	return &e.states[e.states.len - 1]
+}
+
+pub fn (mut e Program) eval(ni NodeIndex, esil string) NodeIndex {
+	e.push_state()
+	e.state().pos = 0
+	e.stack = []
+	e.state().tokens = esil.split(',')
+	pc := e.pc().u64()
+	for pos in 0 .. e.state().tokens.len {
+		e.state().pos = pos
+		// create node for token nth
+		node := e.cur_node()
+		// dump(node)
+		match node.typ {
+			._operation {
+				if false {
+					dst := e.pop_index()
+					src := e.pop_index()
+					// pc := '${e.pc()}.$e.state().pos'.u64()
+					eqop := e.add_name(._operation, node.name, [
+						dst,
+						src,
+					])
+					// e.add_symbol(pc, dst), e.add_symbol(pc, src), ])
+					e.add_child(ni, eqop)
+				} else {
+					dst := e.pop()
+					src := e.pop()
+					// pc := '${e.pc()}.$e.state().pos'.u64()
+					eqop := e.add_name(._operation, node.name, [
+						e.add_symbol(pc, dst),
+						e.add_symbol(pc, src),
+					])
+					// e.add_symbol(pc, dst), e.add_symbol(pc, src), ])
+					e.add_child(ni, eqop)
+				}
+			}
+			._condition {}
+			._assign {
+				dst := e.pop()
+				src := e.pop()
+				// eprintln('assign $src $dst')
+				if false {
+					_ := e.add_name(._register, dst, [])
+					_ := e.add_name(._register, src, [])
+					var_res := e.new_local(4, 'res')
+					var_rus := e.new_local(4, 'rus')
+					res_byebye := e.add(._assign, [var_res, var_rus])
+					e.add_child(ni, res_byebye)
+				}
+				eqop := e.add(._assign, [
+					e.add_symbol(pc, dst),
+					e.add_symbol(pc, src),
+				])
+				e.add_child(ni, eqop)
+			}
+			._symbol {
+				//
+				e.push(node.name)
+				e.push_index(pos)
+			}
+			._goto {
+				// process and convert
+			}
+			._number {
+				//
+				e.push(node.name)
+				e.push_index(pos)
+			}
+			else {
+				eprintln('unk $node.name')
+			}
+		}
+		// dump(node)
+		e.state().pos++
+	}
+	e.pop_state()
+	return ni
+}
+
+pub fn (mut e Program) cur_node() &Node {
+	mut n := &Node{}
+	n.typ = e.find_statement_type()
+	/*
+	e.state().push('')
+	e.state().pop()
+	*/
+	n.addr = e.pc()
+	n.pos = e.state().pos
+	n.name = e.state().tokens[n.pos]
+	return n
+}
+
+pub fn (e Program) pc() string {
+	return e.r2.cmd('ar?PC').trim_space()
+}

east/east/opt.v

@@ -0,0 +1,28 @@
+module east
+
+pub fn (mut e Program) optimize(ni NodeIndex) {
+	// run different levels of optimizations starting on given node
+	// this function must replicate the code in print() to walk the ast
+	// and find optimizations and modify the ast accordingly
+	e.optimize_const(ni)
+	//	e.optimize_empty(ni)
+}
+
+pub fn (mut e Program) optimize_const(ni NodeIndex) {
+	// propagate constant values and fold unnecessary nodes
+}
+
+pub fn (mut e Program) optimize_empty(ni NodeIndex) {
+	mut n := e.node(ni)
+	mut children := []NodeIndex{}
+	for c in n.children {
+		cn := e.node(c)
+		if cn.children.len >= 0 {
+			e.del_child(ni, c)
+			//	children << c
+			children << c
+		}
+		// e.optimize_empty(c)
+	}
+	n.children = children
+}

east/east/print.v

@@ -0,0 +1,265 @@
+module east
+
+pub fn (mut e Program) str() string {
+	return e.str_node(0)
+}
+
+pub fn (mut e Program) incdent(inc int) {
+	e.indent_level += inc
+}
+
+pub fn (mut e Program) indent() string {
+	mut s := []string{}
+	for _ in 0 .. e.indent_level {
+		s << ''
+	}
+	return s.join('  ')
+}
+
+pub fn (mut e Program) str_args(idx int) string {
+	e.ast.find_type = ._argument
+	s := e.str_code(idx)
+	e.ast.find_type = ._none
+	return s.trim_space().split('\n').join(', ')
+}
+
+pub fn (mut e Program) str_locals(idx int) string {
+	e.ast.find_type = ._local
+	s := e.str_code(idx)
+	e.ast.find_type = ._none
+	return s
+}
+
+pub fn (mut e Program) str_code(idx int) string {
+	e.deep++
+	if e.deep > 10 {
+		eprintln('yamete kudasai')
+		e.deep--
+		return ''
+	}
+	mut s := []string{}
+	n := e.node(idx)
+	typ := e.ast.find_type
+	match n.typ {
+		._call {
+			sym := e.str_code(n.children[0]).trim_space()
+			arg := e.str_code(n.children[1]).trim_space()
+			if typ == ._none {
+				// s << e.indent()
+				s << '$sym ($arg)'
+			} else {
+				s << sym
+				s << arg
+			}
+		}
+		._block {
+			if n.children.len == 0 {
+				// nothing
+			} else if typ == ._none {
+				s << '{\n'
+				e.incdent(2)
+				for c in n.children {
+					e.indent()
+					s << e.str_code(c) + '\n'
+				}
+				e.incdent(-2)
+				s << e.indent() + '}\n'
+			} else {
+				for c in n.children {
+					s << e.str_code(c)
+				}
+			}
+		}
+		._function {
+			if typ == ._none {
+				args := e.str_args(idx)
+				s << 'fn ${n.name}($args) {\n'
+				e.incdent(2)
+				mut locals := []string{}
+				for loc in e.str_locals(idx).split('\n') {
+					if loc !in locals {
+						if loc != '' {
+							// TODO: use r2 to resolve type for this variable
+							locals << loc
+						}
+					}
+				}
+				for loc in locals {
+					s << e.indent()
+					s << 'var $loc\n'
+				}
+				for c in n.children {
+					s << e.indent()
+					s << e.str_code(c) + '\n'
+				}
+				e.incdent(-2)
+				s << '}\n'
+			} else {
+				for c in n.children {
+					s << e.str_code(c)
+				}
+			}
+		}
+		._if {
+			if typ == ._none {
+				s << 'if '
+				s << e.str_code(n.children[0])
+				s << ' {\n'
+				e.incdent(2)
+				s << e.str_code(n.children[1])
+				if n.children.len > 2 {
+					// TODO: handle else if
+					e.incdent(-2)
+					s << e.indent()
+					s << '} else {\n'
+					e.incdent(2)
+					s << e.str_code(n.children[2])
+					e.incdent(-2)
+					s << e.indent()
+					s << '}\n'
+				} else {
+					e.incdent(-2)
+					s << e.indent()
+					s << '}\n'
+				}
+			} else {
+				s << e.str_code(n.children[0])
+				s << e.str_code(n.children[1])
+				if n.children.len > 2 {
+					s << e.str_code(n.children[2])
+				}
+			}
+		}
+		._comment {
+			if typ == ._none {
+				if n.name != '' {
+					s << e.indent()
+					s << '// $n.name '
+				}
+			}
+		}
+		._operation {
+			if typ == ._none {
+				s << e.indent()
+				if _ := n.name.index('=') {
+					s << e.str_code(n.children[0])
+					s << ' $n.name '
+					s << 'tmp'
+				} else {
+					s << 'tmp = '
+					s << e.str_code(n.children[0])
+					s << ' $n.name '
+					// nn := e.node(n.children[1])
+					// s << ' ($nn) '
+					dos := e.str_code(n.children[1])
+					if dos == '' {
+						s << 'tmp'
+					} else {
+						s << dos
+					}
+				}
+			}
+		}
+		._condition {
+			if typ != ._none {
+				for c in n.children {
+					s << e.str_code(c)
+				}
+			} else {
+				s << '('
+				for c in n.children {
+					s << e.str_code(c).trim_space()
+				}
+				s << ')'
+			}
+		}
+		._while {
+			if typ == ._none {
+				s << 'while $n.name {\n'
+				e.incdent(2)
+				for c in n.children {
+					s << e.indent()
+					s << e.str_code(c) + '\n'
+				}
+				e.incdent(-2)
+				s << '}\n'
+			} else {
+				for c in n.children {
+					s << e.str_code(c)
+				}
+			}
+		}
+		._argument {
+			if typ == ._none || typ == ._argument {
+				s << '$n.name\n'
+			}
+		}
+		._assign {
+			if typ == ._none {
+				s << e.indent()
+				s << e.str_code(n.children[0]).trim_space()
+				s << ' = '
+				s << e.str_code(n.children[1]).trim_space()
+			} else {
+				s << e.str_code(n.children[0])
+				s << e.str_code(n.children[1])
+			}
+		}
+		._register, ._symbol {
+			if typ == ._none {
+				s << '$n.name'
+			}
+		}
+		._number {
+			if typ == ._none {
+				s << '$n.name'
+			}
+		}
+		._label {
+			if typ == ._none && n.name != '' {
+				s << e.indent() + '$n.name:\n'
+			}
+		}
+		._string {
+			if typ == ._none {
+				s << '"$n.name"'
+			}
+		}
+		._local {
+			if typ == ._none || typ == ._local {
+				name := '$n.name\n'
+				if name !in s {
+					s << name
+				}
+			}
+		}
+		else {
+			// eprintln('Unhandled node $n')
+		}
+	}
+	e.deep--
+	return s.join('')
+}
+
+pub fn (mut e Program) str_node(idx int) string {
+	n := e.node(idx)
+	mut s := []string{}
+	/*
+	s << 'node_name: $n.name\n'
+	for c in n.children {
+		s << '- $c\n'
+	}
+	s << '## Nodes\n'
+	for c in e.state().nodes {
+		s << '- $c\n'
+	}
+	s << '## Decompilation\n'
+	*/
+	if n.typ == ._function {
+		//
+		s << e.str_code(idx)
+	} else {
+		eprintln('We can only start decompiling from a function')
+	}
+	return s.join('')
+}

east/main.v

@@ -0,0 +1,194 @@
+import east
+import os
+import cli { Command, Flag }
+import radare.r2pipe
+
+struct Options {
+	esil string
+	file string
+	arch string
+}
+
+fn pdvtool() Options {
+	mut cmd := Command{
+		name: 'east'
+		description: 'esil-ast based decompiler on top of r2'
+		version: '0.0.1'
+	}
+	cmd.add_flag(Flag{
+		flag: .string
+		name: 'file'
+		abbrev: 'f'
+		description: 'program file to open'
+	})
+	cmd.add_flag(Flag{
+		flag: .string
+		name: 'esil'
+		abbrev: 'e'
+		description: 'esil expression to decompile'
+	})
+	/*
+	mut test_cmd := Command{
+		name: 'test'
+		description: 'decompile an esil expression'
+	}
+	cmd.add_command(test_cmd)
+	*/
+	cmd.setup()
+	cmd.parse(os.args)
+	if os.args.len == 1 {
+		exit(1)
+	}
+	mut arch := ''
+	if e := cmd.flags.get_string('arch') {
+		if e != '' {
+			arch = e
+		}
+	}
+	mut file := '-'
+	if e := cmd.flags.get_string('file') {
+		if e != '' {
+			file = e
+		}
+	}
+	mut esil := ''
+	if e := cmd.flags.get_string('esil') {
+		if e != '' {
+			esil = e
+		}
+	}
+	return Options{
+		arch: arch
+		esil: esil
+		file: file
+	}
+}
+
+fn main() {
+	mut opt := pdvtool()
+	println(opt)
+	if opt.esil != '' {
+		main_hello(opt)
+	} else {
+		main_hello(opt)
+		main_hello2()
+		main_hello3()
+	}
+}
+
+fn main_hello(opt Options) {
+	r2 := r2pipe.spawn(opt.file, '') or {
+		eprintln('r2pipe.spawn: $err')
+		exit(1)
+	}
+	if opt.arch != '' {
+		r2.cmd('e asm.arch=$opt.arch')
+	}
+	esil := if opt.esil == '' { '1,eax,:=' } else { opt.esil }
+	mut program := east.new_program(r2)
+	mut statements := []east.NodeIndex{}
+	statements << program.new_statement('0x1000', esil)
+	mut function := program.new_function('test', statements)
+	kode := program.str_node(function)
+	println(kode)
+}
+
+fn main_hello2() {
+	r2 := r2pipe.spawn('test/bins/hello', '') or {
+		eprintln('r2pipe.spawn: $err')
+		exit(1)
+	}
+	mut program := east.new_program(r2)
+
+	func := program.load_function('main')
+	// test adding node
+	{
+		var_res := program.new_local(4, 'res')
+		var_rus := program.new_local(4, 'rus')
+		res_byebye := program.add(._assign, [var_res, var_rus])
+		program.add_child(func, res_byebye)
+	}
+	kode := program.str_node(func)
+	println(kode)
+	exit(0)
+}
+
+fn main_hello3() {
+	r2 := r2pipe.spawn('test/bins/hello', '') or {
+		eprintln('r2pipe.spawn: $err')
+		exit(1)
+	}
+	mut e := east.new_program(r2)
+	// e.on('reg_read', fn (name) => { if name == 'PC' { } })
+
+	/*
+	e.add_symbol('esi', 'arg0')
+	e.add_symbol('rsi', 'arg0')
+	e.add_symbol('esi', 'arg1')
+	e.add_symbol('rsi', 'arg1')
+
+	if s := e.find_symbol('rsi') {
+		println('arg0 is accessed')
+		// e.propagate_symbol()
+	}
+	*/
+
+	for _ in 0 .. 10 {
+		pc := e.pc()
+		e.step()
+		expr := e.expr(pc)
+		e.eval(0, expr)
+		eprintln('before($pc) now($e.pc()) $expr')
+	}
+
+	/*
+	e.add_type('int', 'int')
+	e.add_type('hello_t', 'struct { int msg; }')
+	*/
+
+	sym_puts := e.add_symbol(0x808080, 'puts')
+	sym_win := e.add_string(0, 'win')
+	sym_fail := e.add_string(0, 'fail')
+
+	cn_bb_true := e.add(._block, [
+		e.add(._call, [sym_puts, sym_win]),
+	])
+	cn_bb_false := e.add(._block, [
+		e.add(._call, [sym_puts, sym_fail]),
+	])
+
+	arg_argc := e.add_argument(0, 'argc')
+	cn_cmp := e.add(._condition, [
+		arg_argc,
+		e.add_operation('<'),
+		e.add_number(10),
+	])
+	ifelse := e.add(._if, [
+		cn_cmp,
+		cn_bb_true,
+		cn_bb_false,
+	])
+
+	sym_byebye := e.add_string(0, 'byebye')
+	call_byebye := e.add(._call, [sym_puts, sym_byebye])
+
+	var_res := e.new_local(4, 'tmp')
+	res_byebye := e.add(._assign, [var_res, call_byebye])
+
+	sym_exit := e.add_symbol(0, 'exit')
+	call_exit := e.add(._call, [sym_exit, var_res])
+
+	n_func := e.add(._function, [
+		ifelse,
+		res_byebye,
+		call_exit,
+	])
+	e.node(n_func).name = 'main'
+
+	// optimize function
+	e.optimize(n_func)
+
+	code := e.str_node(n_func)
+	println(code)
+	r2.cmd('q')
+}

east/pdv.v

@@ -0,0 +1,75 @@
+module pdv
+
+import east
+import json
+import radare.r2
+
+struct R2ijcore {
+	file string
+	size int
+	fd   int
+}
+
+struct R2ij {
+	core R2ijcore
+}
+
+pub struct RCore {}
+
+fn plugin_call(coreptr voidptr, cmd &char) int {
+	// eprintln('cal')
+	core := r2.cast(coreptr)
+	c := unsafe { cmd.vstring() }
+	if c.starts_with('pdv') {
+		core.cmd('?E decompiler not yet integrated')
+		ij := core.cmd('ij')
+		a := json.decode(R2ij, ij) or {
+			eprintln('failed to decode ij JSON')
+			return 0
+		}
+		eprintln(a.core.file)
+		//
+		r2p := r2.cast(core)
+		mut e := east.new_program(r2p)
+		fname := r2p.cmd('afi.')
+		if fname.len > 0 {
+			func := e.load_function(fname)
+			e.optimize(func)
+			kode := e.str_node(func)
+			println(kode)
+		} else {
+			eprintln('No function?')
+		}
+		// e.free ()
+		return 1
+	}
+	return 0
+}
+
+// definition
+
+// ignored
+[export: 'radare_plugin_function']
+[manual_free]
+fn radare_plugin_function() &C.r_lib_struct_t {
+	pdv_plugin := &C.r_core_plugin_t{
+		name: 'pdv'.str
+		desc: 'the v decompiler for r2'.str
+		license: 'MIT'.str
+		call: plugin_call
+	}
+	unsafe {
+		pp := C.malloc(1024) // too large
+		C.memcpy(pp, pdv_plugin, 1024)
+		p := &C.r_lib_struct_t{
+			@type: C.R_LIB_TYPE_CORE
+			data: pp // &pdv_plugin
+			pkgname: 'pdv'.str
+		}
+		ppp := C.malloc(1024) // too large
+		C.memcpy(ppp, p, 1024)
+		return ppp
+	}
+	// C.fprintf(C.stderr, '%p\n'.str, p)
+	// return p
+}

east/test/bins/hello.c

@@ -0,0 +1,19 @@
+#include <stdio.h>
+
+void fn_hello(void) {
+	puts ("Hello World");
+}
+
+int fn_ifelse(int argc) {
+	if (argc < 3) {
+		puts ("one");
+		return 1;
+	}
+	return 0;
+}
+
+int main(int argc) {
+	fn_hello ();
+	int res = fn_ifelse (argc);
+	return res;
+}

east/v.mod

@@ -0,0 +1,9 @@
+Module {
+	name: 'east'
+	description: 'An ESIL-based decommpiler for r2 written in V'
+	version: '0.1.0'
+	author: 'pancake'
+	license: 'MIT'
+	repo_url: 'https://github.com/vlang/v'
+	dependencies: ['radare.r2', 'radare.r2pipe']
+}

examples/my-cpu/Makefile

@@ -1,5 +1,5 @@
 NAME=mycpu
-R2_PLUGIN_PATH=$(shell r2 -hh|grep LIBR_PLUGINS|awk '{print $$2}')
+R2_PLUGIN_PATH=$(shell r2 -hh|grep R2_LIBR_PLUGINS|awk '{print $$2}')
 CFLAGS=-g -fPIC $(shell pkg-config --cflags r_asm)
 LDFLAGS=-shared $(shell pkg-config --libs r_asm)
 OBJS=$(NAME).o

examples/my-cpu/mycpu.c

@@ -30,10 +30,10 @@ static int disassemble (RAsm *a, RAsmOp *op, const ut8 *b, int l) {
 	int idx = (b[0]&0xf)*2;
 	op->size = 2;
 	if (idx>=(OPS*2)) {
-		strcpy (op->buf_asm, "invalid");
+		r_strbuf_set (&op->buf_asm, "invalid");
 		return -1;
 	}
-	strcpy (op->buf_asm, ops[idx]);
+	r_strbuf_set (&op->buf_asm, ops[idx]);
 	if (ops[idx+1]) {
 		const char *p = ops[idx+1];
 		arg[0] = 0;
@@ -50,8 +50,8 @@ static int disassemble (RAsm *a, RAsmOp *op, const ut8 *b, int l) {
 			sprintf (arg, "r%d, %d", b[1]>>4, (char)b[1]&0xf);
 		}
 		if (*arg) {
-			strcat (op->buf_asm, " ");
-			strcat (op->buf_asm, arg);
+			r_strbuf_append (&op->buf_asm, " ");
+			r_strbuf_append (&op->buf_asm, arg);
 		}
 	}
 	return op->size;
@@ -67,7 +67,7 @@ RAsmPlugin r_asm_plugin_mycpu = {
 };
 
 #ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
         .type = R_LIB_TYPE_ASM,
         .data = &r_asm_plugin_mycpu
 };

iref/Makefile

@@ -0,0 +1,29 @@
+D=$(DESTDIR)/$(shell r2 -H R2_USER_PLUGINS)/iref-db
+BINDIR=$(shell r2pm -H R2PM_BINDIR)
+B=$(DESTDIR)/$(BINDIR)/
+
+all:
+
+clean:
+
+install: user-install
+
+user-uninstall uninstall:
+	rm -f "$(B)/iref"
+	rm -rf "$(D)"
+
+user-install:
+	mkdir -p "$(B)"
+	cp iref.sh $(B)/iref
+	chmod +x $(B)/iref
+	mkdir -p "$(D)"
+	tar xJvf iref-db.txz -C $(D)
+
+sync: cutterref
+	rm -rf iref-db
+	cd cutterref/archs && tar cJvf ../../iref-db.txz *.sql
+
+cutterref:
+	git clone https://github.com/yossizap/cutterref
+
+.PHONY: sync all install user-install user-uninstall uninstall clean

iref/README.md

@@ -0,0 +1,24 @@
+iref
+====
+
+This is a commandline version of the cutterref tool.
+
+
+Installation
+------------
+
+```
+$ r2pm -ci iref
+```
+
+Usage
+-----
+
+See this video demo: [https://youtu.be/jne9e_kBS8E](https://youtu.be/jne9e_kBS8E)
+
+```
+$ r2 /bin/ls
+> "$a=!!iref x86-64 `ao~mnemonic[1]`"
+> $a
+> !iref x86-64 nop
+```

iref/iref.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+A="$1"
+M="`echo $2 |tr '[a-z]' '[A-Z]'`"
+
+R2_USER_PLUGINS=$(r2 -H R2_USER_PLUGINS)
+if [ -z "$A" ]; then
+	echo "Usage: iref [arch] ([insn])"
+	if [ ! -d iref-db ]; then
+		 cd "$R2_USER_PLUGINS" || exit 1
+	fi
+	cd iref-db 
+	ls |sed -e 's,.sql,,'
+	exit 1
+fi
+if [ ! -f "iref-db/$A.sql" ]; then
+	cd "$R2_USER_PLUGINS" || exit 1
+	if [ ! -f "iref-db/$A.sql" ]; then
+		echo "Cannot load $A"
+		exit 1
+	fi
+fi
+
+if [ -z "$M" ]; then
+	echo "select mnem from instructions" | sqlite3 -init iref-db/$A.sql | tr 'A-Z' 'a-z'
+else
+	echo "select description from instructions where mnem = '$M'" | sqlite3 -init iref-db/$A.sql
+fi

jaguar-gpu/Makefile

@@ -0,0 +1,21 @@
+NAME=jaguar-gpu
+R2_PLUGIN_PATH=$(shell r2 -hh|grep R2_LIBR_PLUGINS|awk '{print $$2}')
+CFLAGS=-g -fPIC $(shell pkg-config --cflags r_asm)
+LDFLAGS=-shared $(shell pkg-config --libs r_asm)
+OBJS=$(NAME).o
+SO_EXT=$(shell uname|grep -q Darwin && echo dylib || echo so)
+LIB=$(NAME).$(SO_EXT)
+
+all: $(LIB)
+
+clean:
+	rm -f $(LIB) $(OBJS)
+
+$(LIB): $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $(LIB)
+
+install:
+	cp -f $(LIB) $(R2_PLUGIN_PATH)
+
+uninstall:
+	rm -f $(R2_PLUGIN_PATH)/$(LIB)

jaguar-gpu/jaguar-gpu.c

@@ -0,0 +1,222 @@
+/*
+ * Disassembler for the Jaguar GPU/DSP
+ * Copyright (C) 2018 - Sebastien Alaiwan
+ */
+
+#include <r_asm.h>
+#include <r_lib.h>
+
+static int read16_BE (const ut8** b)
+{
+	int val = ((*b)[0] << 8) | ((*b)[1] << 0);
+	(*b) += 2;
+	return val;
+}
+
+static const char* condition (int code)
+{
+	switch (code)
+	{
+	case 0:  return "mp"; /* always */
+	case 1:  return "nz";
+	case 2:  return "z";
+	case 4:  return "nc";
+	case 5:  return "nc/nz";
+	case 6:  return "nc/z";
+	case 8:  return "c";
+	case 9:  return "c/nz";
+	case 10: return "c/z";
+	case 20: return "nn";
+	case 21: return "nn/nz";
+	case 22: return "nn/z";
+	case 24: return "n";
+	case 25: return "n/nz";
+	case 26: return "n/z";
+	case 31: return "never";
+	default: return "?";
+	}
+};
+
+static int notZero (int val)
+{
+	return val == 0 ? 32 : val;
+}
+
+static int disassemble (RAsm *a, RAsmOp *op, const ut8 *b, int l) {
+	const ut8* p = b; /* read pointer */
+
+	const uint word = read16_BE (&p);
+	const uint opCode = (word >> 10) & 63;
+	const uint reg1 = (word >> 5) & 31;
+	const uint reg2 = (word >> 0) & 31;
+
+	uint pc = a->pc;
+
+	pc += 2;
+	switch (opCode)
+	{
+	case 0:  r_strbuf_setf (&op->buf_asm, "add     r%d, r%d", reg1, reg2);
+					 break;
+	case 1:  r_strbuf_setf (&op->buf_asm, "addc    r%d, r%d", reg1, reg2);
+					 break;
+	case 2:  r_strbuf_setf (&op->buf_asm, "addq    0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 3:  r_strbuf_setf (&op->buf_asm, "addqt   0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 4:  r_strbuf_setf (&op->buf_asm, "sub     r%d, r%d", reg1, reg2);
+					 break;
+	case 5:  r_strbuf_setf (&op->buf_asm, "subc    r%d, r%d", reg1, reg2);
+					 break;
+	case 6:  r_strbuf_setf (&op->buf_asm, "subq    0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 7:  r_strbuf_setf (&op->buf_asm, "subqt   0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 8:  r_strbuf_setf (&op->buf_asm, "neg     r%d", reg2);
+					 break;
+	case 9:  r_strbuf_setf (&op->buf_asm, "and     r%d, r%d", reg1, reg2);
+					 break;
+	case 10: r_strbuf_setf (&op->buf_asm, "or      r%d, r%d", reg1, reg2);
+					 break;
+	case 11: r_strbuf_setf (&op->buf_asm, "xor     r%d, r%d", reg1, reg2);
+					 break;
+	case 12: r_strbuf_setf (&op->buf_asm, "not     r%d", reg2);
+					 break;
+	case 13: r_strbuf_setf (&op->buf_asm, "btst    0x%x, r%d", reg1, reg2);
+					 break;
+	case 14: r_strbuf_setf (&op->buf_asm, "bset    0x%x, r%d", reg1, reg2);
+					 break;
+	case 15: r_strbuf_setf (&op->buf_asm, "bclr    0x%x, r%d", reg1, reg2);
+					 break;
+	case 16: r_strbuf_setf (&op->buf_asm, "mult    r%d, r%d", reg1, reg2);
+					 break;
+	case 17: r_strbuf_setf (&op->buf_asm, "imult   r%d, r%d", reg1, reg2);
+					 break;
+	case 18: r_strbuf_setf (&op->buf_asm, "imultn  r%d, r%d", reg1, reg2);
+					 break;
+	case 19: r_strbuf_setf (&op->buf_asm, "resmac  r%d", reg2);
+					 break;
+	case 20: r_strbuf_setf (&op->buf_asm, "imacn   r%d, r%d", reg1, reg2);
+					 break;
+	case 21: r_strbuf_setf (&op->buf_asm, "div     r%d, r%d", reg1, reg2);
+					 break;
+	case 22: r_strbuf_setf (&op->buf_asm, "abs     r%d", reg2);
+					 break;
+	case 23: r_strbuf_setf (&op->buf_asm, "sh      r%d, r%d", reg1, reg2);
+					 break;
+	case 24: r_strbuf_setf (&op->buf_asm, "shlq    0x%x, r%d", 32 - notZero (reg1), reg2);
+					 break;
+	case 25: r_strbuf_setf (&op->buf_asm, "shrq    0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 26: r_strbuf_setf (&op->buf_asm, "sha     r%d, r%d", reg1, reg2);
+					 break;
+	case 27: r_strbuf_setf (&op->buf_asm, "sharq   0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 28: r_strbuf_setf (&op->buf_asm, "ror     r%d, r%d", reg1, reg2);
+					 break;
+	case 29: r_strbuf_setf (&op->buf_asm, "rorq    0x%x, r%d", notZero (reg1), reg2);
+					 break;
+	case 30: r_strbuf_setf (&op->buf_asm, "cmp     r%d, r%d", reg1, reg2);
+					 break;
+	case 31: r_strbuf_setf (&op->buf_asm, "cmpq    0x%x, r%d", reg1, reg2);
+					 break;
+	case 32: r_strbuf_setf (&op->buf_asm, "sat8    r%d", reg2);
+					 break;
+	case 33: r_strbuf_setf (&op->buf_asm, "sat16   r%d", reg2);
+					 break;
+	case 34: r_strbuf_setf (&op->buf_asm, "move    r%d, r%d", reg1, reg2);
+					 break;
+	case 35: r_strbuf_setf (&op->buf_asm, "moveq   0x%x, r%d", reg1, reg2);
+					 break;
+	case 36: r_strbuf_setf (&op->buf_asm, "moveta  r%d, r%d", reg1, reg2);
+					 break;
+	case 37: r_strbuf_setf (&op->buf_asm, "movefa  r%d, r%d", reg1, reg2);
+					 break;
+	case 38:
+					 {
+						 uint low = read16_BE (&p);
+						 uint high = read16_BE (&p);
+						 r_strbuf_setf (&op->buf_asm, "movei   0x%x, r%d", low | (high << 16), reg2);
+						 break;
+					 }
+	case 39: r_strbuf_setf (&op->buf_asm, "loadb   [r%d], r%d", reg1, reg2);
+					 break;
+	case 40: r_strbuf_setf (&op->buf_asm, "loadw   [r%d], r%d", reg1, reg2);
+					 break;
+	case 41: r_strbuf_setf (&op->buf_asm, "load    [r%d], r%d", reg1, reg2);
+					 break;
+	case 42: r_strbuf_setf (&op->buf_asm, "loadp   [r%d], r%d", reg1, reg2);
+					 break;
+	case 43: r_strbuf_setf (&op->buf_asm, "load    [r14+0x%x], r%d", notZero (reg1)*4, reg2);
+					 break;
+	case 44: r_strbuf_setf (&op->buf_asm, "load    [r15+0x%x], r%d", notZero (reg1)*4, reg2);
+					 break;
+	case 45: r_strbuf_setf (&op->buf_asm, "storeb  r%d, [r%d]", reg2, reg1);
+					 break;
+	case 46: r_strbuf_setf (&op->buf_asm, "storew  r%d, [r%d]", reg2, reg1);
+					 break;
+	case 47: r_strbuf_setf (&op->buf_asm, "store   r%d, [r%d]", reg2, reg1);
+					 break;
+	case 48: r_strbuf_setf (&op->buf_asm, "storep  r%d, [r%d]", reg2, reg1);
+					 break;
+	case 49: r_strbuf_setf (&op->buf_asm, "store   r%d, [r14+0x%x]", reg2, notZero (reg1)*4);
+					 break;
+	case 50: r_strbuf_setf (&op->buf_asm, "store   r%d, [r15+0x%x]", reg2, notZero (reg1)*4);
+					 break;
+	case 51: r_strbuf_setf (&op->buf_asm, "move    pc, r%d", reg2);
+					 break;
+	case 52: r_strbuf_setf (&op->buf_asm, "j%s     [r%d]", condition(reg2), reg1);
+					 break;
+	case 53: r_strbuf_setf (&op->buf_asm, "j%s     0x%.8X", condition(reg2), pc + ((int8_t)(reg1 << 3) >> 2));
+					 break;
+	case 54: r_strbuf_setf (&op->buf_asm, "mmult   r%d, r%d", reg1, reg2);
+					 break;
+	case 55: r_strbuf_setf (&op->buf_asm, "mtoi    r%d, r%d", reg1, reg2);
+					 break;
+	case 56: r_strbuf_setf (&op->buf_asm, "normi   r%d, r%d", reg1, reg2);
+					 break;
+	case 57: r_strbuf_setf (&op->buf_asm, "nop");
+					 break;
+	case 58: r_strbuf_setf (&op->buf_asm, "load    [r14+r%d], r%d", reg1, reg2);
+					 break;
+	case 59: r_strbuf_setf (&op->buf_asm, "load    [r15+r%d], r%d", reg1, reg2);
+					 break;
+	case 60: r_strbuf_setf (&op->buf_asm, "store   r%d, [r14+r%d]", reg2, reg1);
+					 break;
+	case 61: r_strbuf_setf (&op->buf_asm, "store   r%d, [r15+r%d]", reg2, reg1);
+					 break;
+	case 62: r_strbuf_setf (&op->buf_asm, "sat24   r%d", reg2);
+					 break;
+	case 63:
+					 {
+						 if (reg1 == 0)
+							 r_strbuf_setf (&op->buf_asm, "pack    r%d", reg2);
+						 else if (reg1 == 1)
+							 r_strbuf_setf (&op->buf_asm, "unpack    r%d", reg2);
+						 else
+							 r_strbuf_setf (&op->buf_asm, "invalid");
+						 break;
+					 }
+	}
+
+	op->size = p - b;
+	r_strbuf_setbin (&op->buf_hex, b, op->size);
+
+	return op->size;
+}
+
+RAsmPlugin r_asm_plugin_jaguar_gpu = {
+	.name = "jaguar-gpu",
+	.arch = "jaguar-gpu",
+	.author = "Sebastien Alaiwan",
+	.bits = 32,
+	.desc = "Disassembler for the Jaguar GPU",
+	.license = "LGPL3",
+	.disassemble = &disassemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ASM,
+	.data = &r_asm_plugin_jaguar_gpu
+};
+#endif

kaitai/Makefile

@@ -0,0 +1,7 @@
+all:
+
+install:
+	cp -f r2kaitai ${DESTDIR}/${PREFIX}/bin/r2kaitai
+
+uninstall:
+	rm -f  ${DESTDIR}/${PREFIX}/bin/r2kaitai

kaitai/README.md

@@ -0,0 +1,27 @@
+Integrating r2 with Kaitai
+==========================
+
+Installation:
+
+	$ r2pm -i kaitai-struct-compiler
+	$ r2pm -i ksv
+	$ r2pm -i r2kaitai
+
+Demo Session:
+
+	$ r2 /bin/ls
+	> !r2kaitai
+	archive/lzh
+	archive/rar
+	archive/zip
+	common/vlq_base128_be
+	common/vlq_base128_le
+	executable/dos_mz
+	executable/elf
+	executable/java_class
+	executable/mach_o
+	...
+
+	> !r2kaitai executables/mach_o
+
+	(... ksv show goes here ...)

kaitai/r2kaitai

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+s='$'
+showHelp() {
+	echo "Usage: r2kaitai [signature.ksy] [$s{R2_BLOCK}]"
+}
+[ "$1" = -h ] && showHelp && exit 0
+
+SIGN="$1"
+FILE="$2"
+R2PM_GITDIR=`r2pm -H R2PM_GITDIR`
+ROOT=${R2PM_GITDIR}/kaitai-struct-compiler/formats
+
+if [ ! -d "${ROOT}" ]; then
+	echo "Cannot find kaitai-struct-compiler"
+	echo '  $ r2pm -i kaitai-struct-compiler'
+	exit 1
+fi
+
+if [ -z "$SIGN" ]; then
+	( cd ${ROOT} && find * -iname '*.ksy' | sed -e 's,.ksy$,,' )
+	exit 0
+fi
+
+if [ ! -f "${ROOT}/${SIGN}.ksy" ]; then
+	echo "Invalid kaitai signature file"
+	exit 1
+fi
+
+if [ -z "${FILE}" ]; then
+	FILE="${R2_FILE}"
+	if [ -z "${FILE}" ]; then
+		showHelp
+		exit 1
+	fi
+fi
+
+echo r2pm -r ksv ${FILE} ${R2PM_GITDIR}/kaitai-struct-compiler/formats/${SIGN}.ksy
+exec r2pm -r ksv ${FILE} ${ROOT}/${SIGN}.ksy

keystone/Makefile

@@ -1,10 +1,18 @@
 include build.mk
 
-PLUGINS=arm x86 mips sparc ppc hexagon sysz
+PLUGINS=arm x86 mips sparc ppc hexagon s390x evm
 
-LIBS=$(addsuffix _ks.$(SO_EXT),$(addprefix asm_,${PLUGINS}))
+LIBS=$(addsuffix _ks.$(SO_EXT),$(addprefix arch_,${PLUGINS}))
 #R2PM_PLUGDIR?=${LIBDIR}/radare2/last/
 R2PM_PLUGDIR?=~/.config/radare2/plugins
+R2PM_PREFIX?=~/.config/radare2/prefix
+
+ifeq ($(shell uname),Darwin)
+KS_LDFLAGS+=-Xlinker -rpath -Xlinker $(R2PM_PREFIX)/lib
+endif
+ifeq ($(shell uname),Linux)
+KS_LDFLAGS+=-Wl,-R$(R2PM_PREFIX)/lib
+endif
 
 .PHONY: all clean install uninstall mrproper test
 
@@ -13,26 +21,32 @@ all: $(PLUGINS)
 #$(info $(LIBS))
 
 define kscc
-$(CC) -fPIC $(LDFLAGS_SHARED) -Wall\
-	$(R2_CFLAGS) $(R2_LDFLAGS)\
-	$(KS_CFLAGS) $(KS_LDFLAGS)\
-	-o asm_$(1)_ks.$(SO_EXT) asm_$(1)_ks.c $(KS_LINK)
+$(CC) -c -fPIC -Wall\
+	$(R2_CFLAGS) $(KS_CFLAGS)\
+	-o arch_$(1)_ks.$(O_EXT) arch_$(1)_ks.c
+$(CXX) $(LDFLAGS_SHARED)\
+	$(R2_LDFLAGS) $(KS_LDFLAGS)\
+	-o arch_$(1)_ks.$(SO_EXT) arch_$(1)_ks.$(O_EXT) $(KS_LINK)
+rm arch_$(1)_ks.$(O_EXT)
 endef
 
 define ksmake
-asm_$(1)_ks.$(SO_EXT): asm_$(1)_ks.c keystone.c
+arch_$(1)_ks.$(SO_EXT): arch_$(1)_ks.c keystone.c
 	$$(call kscc,$(1))
 endef
 
 $(foreach lib,$(PLUGINS),$(eval $(call ksmake,$(lib))))
 
 $(PLUGINS):
-	$(MAKE) asm_$@_ks.$(SO_EXT)
+	$(MAKE) arch_$@_ks.$(SO_EXT)
 
 install:
 	$(foreach lib,$(LIBS),$(INSTALL_LIB) $(lib) $(R2PM_PLUGDIR);)
 
-uninstall:
+user-install:
+	$(foreach lib,$(LIBS),$(INSTALL_LIB) $(lib) $(R2PM_PLUGDIR);)
+
+user-uninstall uninstall:
 	rm -rf $(R2PM_PLUGDIR)/*_ks.*
 
 test:

keystone/arch_arm_ks.c

@@ -0,0 +1,46 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/arm.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_arch arch = KS_ARCH_ARM;
+	ks_mode mode = KS_MODE_ARM;
+	switch (a->config->bits) {
+	case 16:
+		mode = KS_MODE_THUMB;
+		break;
+	case 64:
+		arch = KS_ARCH_ARM64;
+		mode = KS_MODE_LITTLE_ENDIAN;
+		a->config->big_endian = false;
+		break;
+	}
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, arch, mode);
+}
+
+RArchPlugin r_arch_plugin_arm_ks = {
+	.meta = {
+		.name = "arm.ks",
+		.desc = "ARM keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "arm",
+	.bits = R_SYS_BITS_PACK3 (16, 32, 64),
+	.encode = &assemble,
+	.decode = NULL,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_arm_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_evm_ks.c

@@ -0,0 +1,34 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/evm.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_SYSTEMZ, mode);
+}
+
+RArchPlugin r_arch_plugin_evm_ks = {
+	.meta = {
+		.name = "evm.ks",
+		.desc = "EVM keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "evm",
+	.bits = 32,
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_evm_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_hexagon_ks.c

@@ -0,0 +1,34 @@
+/* radare2-keystone - GPL - Copyright 2016 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/hexagon.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_HEXAGON, mode);
+}
+
+RArchPlugin r_arch_plugin_hexagon_ks = {
+	.meta = {
+		.name = "hexagon.ks",
+		.desc = "Hexagon keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "hexagon",
+	.bits = 32,
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_hexagon_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_mips_ks.c

@@ -0,0 +1,45 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/mips.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode;
+	switch (a->config->bits) {
+	case 16:
+		mode = KS_MODE_MICRO; // micromips mode
+		break;
+	case 32:
+		mode = KS_MODE_MIPS32;
+		break;
+	case 64:
+		mode = KS_MODE_MIPS64;
+		break;
+	}
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_MIPS, mode);
+}
+
+RArchPlugin r_arch_plugin_mips_ks = {
+	.meta = {
+		.name = "mips.ks",
+		.desc = "MIPS keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "mips",
+	.bits = R_SYS_BITS_PACK3 (16, 32, 64),
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+struct r_lib_struct_t radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_mips_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_ppc_ks.c

@@ -0,0 +1,42 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/ppc.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	switch (a->config->bits) {
+	case 32:
+		mode = KS_MODE_PPC32;
+		break;
+	case 64:
+		mode = KS_MODE_PPC64;
+		break;
+	}
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_PPC, mode);
+}
+
+RArchPlugin r_arch_plugin_ppc_ks = {
+	.meta = {
+		.name = "ppc.ks",
+		.desc = "powerpc keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "ppc",
+	.bits = R_SYS_BITS_PACK2 (32,64),
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_ppc_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_s390x_ks.c

@@ -0,0 +1,34 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/systemz.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_SYSTEMZ, mode);
+}
+
+RArchPlugin r_arch_plugin_s390x_ks = {
+	.meta = {
+		.name = "s390x.ks",
+		.desc = "SystemZ keystone assembler (S390X)",
+		.license = "GPL",
+	},
+	.arch = "s390x",
+	.bits = 32,
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_s390x_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_sparc_ks.c

@@ -0,0 +1,42 @@
+/* radare2-keystone - GPL - Copyright 2016 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/sparc.h>
+
+#include "keystone.c"
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	switch (a->config->bits) {
+	case 32:
+		mode = KS_MODE_SPARC32;
+		break;
+	case 64:
+		mode = KS_MODE_SPARC64;
+		break;
+	}
+	if (a->config->big_endian) {
+		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_SPARC, mode);
+}
+
+RArchPlugin r_arch_plugin_sparc_ks = {
+	.meta = {
+		.name = "sparc.ks",
+		.desc = "sparc keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "sparc",
+	.bits = R_SYS_BITS_PACK2 (32, 64),
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_sparc_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/arch_x86_ks.c

@@ -0,0 +1,42 @@
+/* radare2-keystone - GPL - Copyright 2016-2023 - pancake */
+
+#include <r_arch.h>
+#include <r_lib.h>
+#include <keystone/keystone.h>
+#include <keystone/x86.h>
+#include "keystone.c"
+
+static bool assemble(RArchSession *a, RAnalOp *ao, RArchEncodeMask mask) {
+	ks_mode mode = (ks_mode)0;
+	switch (a->config->bits) {
+	case 16:
+		mode = KS_MODE_16;
+		break;
+	case 32:
+		mode = KS_MODE_32;
+		break;
+	case 64:
+		mode = KS_MODE_64;
+		break;
+	}
+	return keystone_assemble (a, ao, ao->mnemonic, KS_ARCH_X86, mode);
+}
+
+RArchPlugin r_arch_plugin_x86_ks = {
+	.meta = {
+		.name = "x86.ks",
+		.desc = "x86 keystone assembler",
+		.license = "GPL",
+	},
+	.arch = "x86",
+	.bits = R_SYS_BITS_PACK3 (16, 32, 64),
+	.encode = &assemble,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ARCH,
+	.data = &r_arch_plugin_x86_ks,
+	.version = R2_VERSION
+};
+#endif

keystone/asm_arm_ks.c

@@ -1,45 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/arm.h>
-#include "keystone.c"
-
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_arch arch = KS_ARCH_ARM;
-	ks_mode mode;
-	switch (a->bits) {
-	case 16:
-		mode = KS_MODE_THUMB;
-		break;
-	case 32:
-		mode = KS_MODE_ARM;
-		break;
-	case 64:
-		mode = KS_MODE_64;
-		arch = KS_ARCH_ARM64;
-		break;
-	}
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, arch, mode);
-}
-
-RAsmPlugin r_asm_plugin_arm_ks = {
-	.name = "arm.ks",
-	.desc = "ARM keystone assembler",
-	.license = "GPL",
-	.arch = "arm",
-	.bits = 16|32|64,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_arm_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_hexagon_ks.c

@@ -1,32 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/hexagon.h>
-#include "keystone.c"
-
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode = (ks_mode)0;
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_HEXAGON, mode);
-}
-
-RAsmPlugin r_asm_plugin_hexagon_ks = {
-	.name = "hexagon.ks",
-	.desc = "Hexagon keystone assembler",
-	.license = "GPL",
-	.arch = "hexagon",
-	.bits = 32,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_hexagon_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_mips_ks.c

@@ -1,43 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/mips.h>
-#include "keystone.c"
-
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode;
-	switch (a->bits) {
-	case 16:
-		mode = KS_MODE_MICRO; // micromips mode
-		break;
-	case 32:
-		mode = KS_MODE_MIPS32;
-		break;
-	case 64:
-		mode = KS_MODE_MIPS64;
-		break;
-	}
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_MIPS, mode);
-}
-
-RAsmPlugin r_asm_plugin_mips_ks = {
-	.name = "mips.ks",
-	.desc = "MIPS keystone assembler",
-	.license = "GPL",
-	.arch = "mips",
-	.bits = 16|32|64,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_mips_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_ppc_ks.c

@@ -1,40 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/ppc.h>
-#include "keystone.c"
-
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode = (ks_mode)0;
-	switch (a->bits) {
-	case 32:
-		mode = KS_MODE_PPC32;
-		break;
-	case 64:
-		mode = KS_MODE_PPC64;
-		break;
-	}
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_PPC, mode);
-}
-
-RAsmPlugin r_asm_plugin_ppc_ks = {
-	.name = "ppc.ks",
-	.desc = "powerpc keystone assembler",
-	.license = "GPL",
-	.arch = "ppc",
-	.bits = 32|64,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_ppc_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_sparc_ks.c

@@ -1,40 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/sparc.h>
-
-#include "keystone.c"
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode = (ks_mode)0;
-	switch (a->bits) {
-	case 32:
-		mode = KS_MODE_SPARC32;
-		break;
-	case 64:
-		mode = KS_MODE_SPARC64;
-		break;
-	}
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_SPARC, mode);
-}
-
-RAsmPlugin r_asm_plugin_sparc_ks = {
-	.name = "sparc.ks",
-	.desc = "sparc keystone assembler",
-	.license = "GPL",
-	.arch = "sparc",
-	.bits = 32|64,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_sparc_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_sysz_ks.c

@@ -1,32 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/systemz.h>
-#include "keystone.c"
-
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode = (ks_mode)0;
-	if (a->big_endian) {
-		mode = (ks_mode)((int)mode | KS_MODE_BIG_ENDIAN);
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_SYSTEMZ, mode);
-}
-
-RAsmPlugin r_asm_plugin_sysz_ks = {
-	.name = "sysz.ks",
-	.desc = "SystemZ keystone assembler (S390X)",
-	.license = "GPL",
-	.arch = "sysz",
-	.bits = 32,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_sysz_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/asm_x86_ks.c

@@ -1,40 +0,0 @@
-/* radare2-keystone - GPL - Copyright 2016 - pancake */
-
-#include <r_asm.h>
-#include <r_lib.h>
-#include <keystone/keystone.h>
-#include <keystone/x86.h>
-
-#include "keystone.c"
-static int assemble(RAsm *a, RAsmOp *ao, const char *str) {
-	ks_mode mode = (ks_mode)0;
-	switch (a->bits) {
-	case 16:
-		mode = KS_MODE_16;
-		break;
-	case 32:
-		mode = KS_MODE_32;
-		break;
-	case 64:
-		mode = KS_MODE_64;
-		break;
-	}
-	return keystone_assemble (a, ao, str, KS_ARCH_X86, mode);
-}
-
-RAsmPlugin r_asm_plugin_x86_ks = {
-	.name = "x86.ks",
-	.desc = "x86 keystone assembler",
-	.license = "GPL",
-	.arch = "x86",
-	.bits = 16 | 32 | 64,
-	.assemble = &assemble,
-};
-
-#ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_x86_ks,
-	.version = R2_VERSION
-};
-#endif

keystone/build.mk

@@ -11,8 +11,9 @@ else
 SO_EXT=so
 endif
 endif
+O_EXT=o
 
-KS_CFLAGS=-I/usr/local/include
-KS_LDFLAGS=-L/usr/local/lib
+KS_CFLAGS=$(shell pkg-config --cflags keystone)
+KS_LDFLAGS=$(shell pkg-config --libs keystone)
 KS_LINK=-lkeystone
 CFLAGS+=-Wextern-c-compat

keystone/config.mk.acr

@@ -4,8 +4,8 @@ LDFLAGS=@LDFLAGS@
 
 R2_CFLAGS=@R2_CFLAGS@
 R2_LDFLAGS=@R2_LDFLAGS@
-
-HAVE_LIB_KEYSTONE=@HAVE_LIB_KEYSTONE@
+KS_CFLAGS=@KS_CFLAGS@
+KS_LDFLAGS=@KS_LDFLAGS@
 
 BUILD_OS=@BUILD_OS@
 

keystone/configure

@@ -1,9 +1,10 @@
 #!/bin/sh
-# This script was automatically generated by ACR v0.10.2
+# This script was automatically generated by ACR v2.2.4
 # @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... "
@@ -23,7 +24,7 @@ while : ; do
 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 {
@@ -38,8 +39,13 @@ shift
 done
 }
 
+QUIET=0
+be_quiet() {
+	QUIET=1
+}
+
 VPATH=`dirname ${0}`
-if [ "${VPATH}" = "." ]; then 
+if [ "${VPATH}" = "." ]; then
 	WODIS=current
 else
 	if [ "${VPATH}" = "${PWD}" ]; then
@@ -59,12 +65,27 @@ if [ -e "${VPATH}/config.guess" ]; then
 	sh ${VPATH}/config.guess
 	return
 fi
-CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
+CPU="`uname -m | tr 'A-Z' 'a-z' | sed -e 's, ,,g' | cut -d - -f 1`"
 OS="`uname -s|tr A-Z a-z`"
+uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
 GNU="`uname --help 2>&1 | grep gnu`"
 [ "${GNU}" ] && OS="${OS}-gnu"
-[ "${CPU}" = ppc ] && CPU="powerpc"
-echo "${CPU}-unknown-${OS}"
+# normalize CPU
+case "${CPU}" in
+	ppc*|powermac*|powermacintosh*|powerpc*)
+		if echo "${CPU}" | grep -q '64'; then
+			CPU=powerpc64
+		else
+			CPU=powerpc
+		fi
+		;;
+	*) ;;
+esac
+VENDOR="unknown"
+if [ "${OS}" = "darwin" ]; then
+	VENDOR=apple
+fi
+echo "${CPU}-${VENDOR}-${OS}"
 }
 
 SEARCHPATH="/usr /usr/local /usr/pkg /sw"
@@ -74,24 +95,29 @@ CROSSBUILD=0
 BUILD=`guess_os`
 HOST="${BUILD}"
 TARGET="${HOST}"
+ETCDIR="/etc"
 SYSCONFDIR=""
+DESCRIPTION=""
 
 create_environ() {
 : ${EPREFIX:="${PREFIX}"}
 : ${SPREFIX:="${PREFIX}"}
 : ${BINDIR:="${SPREFIX}/bin"}
 : ${SBINDIR:="${PREFIX}/sbin"}
-: ${SYSCONFDIR:="${SPREFIX}/etc"}
+: ${ETCDIR:="${SPREFIX}/etc"}
 : ${LIBDIR:="${SPREFIX}/lib"}
+: ${PKGCFG_LIBDIR:='${exec_prefix}/lib'}
+: ${PKGCFG_INCDIR:='${prefix}/include'}
 : ${LIBEXECDIR:="${SPREFIX}/libexec"}
 : ${INCLUDEDIR:="${SPREFIX}/include"}
 : ${DATADIR:="${SPREFIX}/share"}
 : ${INFODIR:="${DATADIR}/info"}
 : ${MANDIR:="${DATADIR}/man"}
+: ${DOCDIR:="${DATADIR}/doc/radare2-keystone"}
 : ${LOCALSTATEDIR:="${SPREFIX}/var"}
 for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do
-  [ -e $A/ginstall ] && : ${INSTALL:=$A/ginstall} && break
-  [ -e $A/install ] && : ${INSTALL:=$A/install} && break
+  [ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break
+  [ -e "$A"/install ] && : ${INSTALL:="$A"/install} && break
 done
 : ${INSTALL_DIR:=${INSTALL} -d}
 : ${INSTALL_DATA:=${INSTALL} -m 644}
@@ -100,12 +126,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='radare2-keystone' ; VERSION='0.1' ; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+ PKGNAME='radare2-keystone' ; VERSION='0.2' ; VERSION_MAJOR=0; VERSION_MINOR=2; VERSION_PATCH=0; VERSION_NUMBER=00200; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
 }
-                
+
 show_usage() {
 cat <<EOF2
-'configure' configures radare2-keystone-0.1 to adapt to many kinds of systems.
+'configure' configures radare2-keystone-0.2 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -116,27 +142,30 @@ Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              display this help and exit
-  -V, --version           display version information and exit
   -r, --report            show what libs/programs require to work
+  -q, --quiet             be quiet, less verbose (see ./configure -qV)
+  -V, --version           display version information and exit
 
 Installation directories:
-  --prefix=PREFIX        install arch-independent files in PREFIX [/usr/local]
   --exec-prefix=EPREFIX  install arch-dependent files in EPREFIX [PREFIX]
+  --prefix=PREFIX        install arch-independent files in PREFIX [/usr/local]
   --sandbox=SPREFIX      sandbox prefix directory: SPREFIX [PREFIX]
 
 Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --libpath=DIR          set rpath/libname-path to linker
+  --docdir=DIR           documentation directory [DATADIR/doc/radare2-keystone]
   --includedir=DIR       C header files [PREFIX/include]
   --infodir=DIR          info documentation [DATADIR/info]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --libpath=DIR          set rpath/libname-path to linker
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --mandir=DIR           man documentation [DATADIR/man]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --etcdir=DIR           same as --sysconfdir (/etc)
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
 
 System types:
   --build=BUILD          configure for building on BUILD [guessed]
@@ -148,7 +177,6 @@ printf "
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
-  CPPFLAGS    C preprocessor flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
@@ -168,12 +196,26 @@ take_environ() {
 : ${CPP:=cpp}
 : ${CC:=gcc}
 : ${CPP:=cpp}
-: ${CXX:=g++}
+: ${CXX:=c++}
 : ${PREFIX:=/usr/local/}
 }
 
+ochof() {
+	[ "$QUIET" = 1 ] && return
+	printf "$*"
+}
+
+ocho() {
+	[ "$QUIET" = 1 ] && return
+	echo "$*"
+}
+
 show_version() {
-echo "radare2-keystone-0.1 configuration script done with acr v0.10.2.
+if [ "$QUIET" = 1 ]; then
+	echo "0.2"
+	exit 0
+fi
+echo "radare2-keystone-0.2 configuration script done with acr v2.2.4.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -181,7 +223,7 @@ exit 0
 
 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
@@ -193,17 +235,23 @@ fi
 case $flag in
 -h|--help|--hel|--h|--he|-help)
 	show_usage ; ;;
+-qV|-quiet-version|--quiet-version)
+	be_quiet
+	show_version ; ;;
+-q|-quiet|--quiet)
+	be_quiet ; ;;
 -V|-version|--version)
 	show_version ; ;;
 -r|--r|--report)
-echo "PKGNAME:   radare2-keystone"
-echo "VERSION:   0.1"
-echo "LANGS:     c c++"
-echo "REQUIRED:  libkeystone"
-echo "PKG-CONFIG:  r_asm"
+echo "PKGNAME:     radare2-keystone"
+echo "VERSION:     0.2"
+echo "AUTHOR:      pancake"
+echo "EMAIL:       [email protected]"
+echo "LANGS:       c c++"
+echo "PKGCONFIG:   r_asm keystone"
 	exit 0
 	;;
---cache-file) 
+--cache-file)
 	# ignored: acr have no cache
 	;;
 --build)
@@ -225,26 +273,34 @@ echo "PKG-CONFIG:  r_asm"
 	SBINDIR="$value"; ;;
 --libexecdir)
 	LIBEXECDIR="$value"; ;;
+--docdir)
+	DOCDIR="$value"; ;;
 --datadir)
 	DATADIR="$value"; ;;
 --sysconfdir)
-	SYSCONFDIR="$value"; ;;
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
+--etcdir)
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
 --sharedstatedir)
 	SHAREDSTATEDIR="$value"; ;;
 --localstatedir)
 	LOCALSTATEDIR="$value"; ;;
 --libdir)
-	LIBDIR="$value"; ;;
+	LIBDIR="$value"
+	PKGCFG_LIBDIR="$value"; ;;
 --libpath)
 	LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;;
 --includedir)
+	PKGCFG_INCDIR="$value"
 	INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
 --infodir)
 	INFODIR="$value"; ;;
 --mandir)
 	MANDIR="$value"; ;;
 
-*) if [ "$value" ]; then eval "`echo $flag2=$value`" ; 
+*) if [ "$value" ]; then eval "`echo $flag2=$value`" ;
 else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;;
 esac
 }
@@ -261,33 +317,30 @@ parse_options "$1"
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR 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 CXX CXXFLAGS HAVE_LANG_CXX HAVE_LIB_KEYSTONE R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_ASM"
+ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR 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 VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C CXX CXXFLAGS HAVE_LANG_CXX PKGCONFIG R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_ASM KS_CFLAGS KS_LDFLAGS HAVE_PKGCFG_KEYSTONE"
 
 create_environ
 
-echo "checking build system type... ${BUILD}"
-echo "checking host system type... ${HOST}"
-echo "checking target system type... ${TARGET}"
+ocho "checking build system type... ${BUILD}"
+ocho "checking host system type... ${HOST}"
+ocho "checking target system type... ${TARGET}"
 [ "${CROSSBUILD}" = 1 ] && echo "using crosscompilation mode."
 
 #split_host BUILD HOST TARGET
 [ -n "${prefix}" ] && PREFIX="${prefix}"
-echo "checking for working directories... ${WODIS}"
-echo "using prefix '${PREFIX}'"
+ocho "checking for working directories... ${WODIS}"
+ocho "using prefix '${PREFIX}'"
 ACR_RMFILES=" test.c a.out a.exe test.c test.cxx a.out a.exe"
 
-
-
-: 
 COMPILER=CC
-printf "checking for c compiler... "
+ochof "checking for c compiler... "
 HAVE_LANG_C=1
 if [ "${CROSSBUILD}" = 1 ]; then
  (command -v ${HOST}-${CC} >/dev/null 2>&1)
  if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
 fi
 echo "int main(int argc, char **argv){return 0;}" > test.c
- (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
+ (exec ${CC} -o a.out ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
 if [ $? = 0 ]; then echo ${CC}; else
  echo no ; HAVE_LANG_C=0
 do_remove
@@ -295,7 +348,7 @@ echo "ERROR: ${CC} cannot create executables" >&2 ;
 exit 1 ; fi
 COMPILER=CXX
 HAVE_LANG_CXX=1
-printf "checking for c++ compiler... "
+ochof "checking for c++ compiler... "
 if [ "${CROSSBUILD}" = 1 ]; then
 (command -v ${HOST}-${CXX} 2>&1 >/dev/null)
 if [ "$?" = 0 ]; then CXX="${HOST}-${CXX}"; fi
@@ -311,45 +364,79 @@ echo "ERROR: ${CXX} cannot create executables" >&2 ;
 do_remove
 exit 1
  fi
-check_library() {
-VAR=$1
-S="$"
-_REQUIRED=$3
-_CHKLIB_NAME=$2
-_CHKLIB_LIBS=$(echo "-l${_CHKLIB_NAME}" | sed 's,+, -l,g')
-printf "checking for lib${_CHKLIB_NAME} ... "
-echo "int main(int ac, char **av){return 0;}" > test.c
-eval ${S}${COMPILER} ${CFLAGS} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${_CHKLIB_LIBS} test.c >/dev/null 2>&1
-if [ $? = 0 ]; then
-	eval ${VAR}=1
-	echo yes
+ochof "checking for pkg-config... "
+ENVWORDS="${ENVWORDS} HAVE_PKGCONFIG"
+if [ -n "$PKGCONFIG" ]; then
+	if [ -x "$PKGCONFIG" ]; then
+		_HAVE_PKGCONFIG="${PKGCONFIG}"
+	else
+		ocho "PKGCONFIG env is not executable"
+		PKGCONFIG=""
+	fi
 else
-	eval ${VAR}=0
-	echo no 
-  echo "this library is required."
-  do_remove
-  exit 1 ; fi }
-check_library HAVE_LIB_KEYSTONE keystone 1 
-[ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
+	IFS=:
+	for A in ${PATH} ; do
+		if [ -x "${A}/pkg-config" ]; then
+			PKGCONFIG="${A}/pkg-config"
+		elif [ -x "${A}/pkgconf" ]; then
+			PKGCONFIG="${A}/pkgconf"
+		else
+			continue
+		fi
+		break
+	done
+	unset IFS
+fi
+if [ -n "${PKGCONFIG}" ]; then
+	ocho ${PKGCONFIG}
+	HAVE_PKGCONFIG=1
+else
+	HAVE_PKGCONFIG=0
+	echo "Cannot find pkg-config or pkgconf in PATH" >&2
+	exit 1
+ocho no; fi
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
+type ${PKGCONFIG} > /dev/null 2>&1 || echo "ERROR: Cannot find valid PKGCONFIG, pkg-config or pkgconf in PATH"
 echo 'Using PKGCONFIG: '${PKGCONFIG}
 printf 'checking pkg-config flags for r_asm... '
 tmp=`${PKGCONFIG} --cflags r_asm 2>/dev/null`
-if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_R_ASM=0; 
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_R_ASM=0;
+R2_CFLAGS='';R2_LDFLAGS='';
 echo 'This package is required'
 exit 1
-else 
-R2_CFLAGS=$tmp; 
+else
+R2_CFLAGS=$tmp;
 tmp=`${PKGCONFIG} --libs r_asm 2>/dev/null`
-if [ $? = 0 ]; then 
-echo yes; HAVE_PKGCFG_R_ASM=1; 
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_R_ASM=1;
 R2_LDFLAGS=$tmp; fi; fi
+if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
+printf 'checking pkg-config flags for keystone... '
+tmp=`${PKGCONFIG} --cflags keystone 2>/dev/null`
+if [ $? != 0 ]; then echo no ; HAVE_PKGCFG_KEYSTONE=0;
+KS_CFLAGS='';KS_LDFLAGS='';
+echo 'This package is required'
+exit 1
+else
+KS_CFLAGS=$tmp;
+tmp=`${PKGCONFIG} --libs keystone 2>/dev/null`
+if [ $? = 0 ]; then
+echo yes; HAVE_PKGCFG_KEYSTONE=1;
+KS_LDFLAGS=$tmp; fi; fi
 SEDFLAGS=" -e '"
 COUNT=0
 for A in ${ENVWORDS} ; do
 	[ "${A}" = VPATH ] && continue
-	[ "${A}" = srcdir ] && continue 
+	[ "${A}" = srcdir ] && continue
 	eval "VAR=\$${A}"
-	VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+	case "" in
+	mingw*|cygwin*|msys*)
+		VAR="`echo ${VAR} | sed -e 's/\\/\\\\/g' -e 's/\,/\\\,/g'`"
+		;;
+	*)
+		VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+		;;
+	esac
 	[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
 	COUNT=$(($COUNT+1))
 	SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
@@ -367,8 +454,8 @@ if [ -f "${VPATH}/${A}.acr" ]; then
    exit 1
   fi
  fi
- echo "creating ${SD_TARGET}"
-mkdir -p $(echo ${A} | sed -e "s,/`basename ${A}`$,,g")
+ ocho "creating ${SD_TARGET}"
+[ "${VPATH}" != '.' ] &&  mkdir -p $(echo ${A} | sed -e "s,/`basename ${A}`$,,g")
  cat ${VPATH}/${SD_TARGET}.acr | \
 eval sed -e "s,@VPATH@,${VPATH}/${A},g" ${SEDFLAGS} > ${SD_TARGET}.tmp
 
@@ -378,7 +465,7 @@ if [ "$VALUE" = 0 ]; then ## FALSE
  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

keystone/configure.acr

@@ -1,12 +1,13 @@
 PKGNAME radare2-keystone
-VERSION 0.1
+VERSION 0.2
 CONTACT pancake ; [email protected]
 
 LANG_C!
 LANG_CXX!
+USE_PKGCONFIG!
 
-
-CHKLIB! keystone
+(( CHKLIB! keystone ))
 PKGCFG! R2_CFLAGS R2_LDFLAGS r_asm
+PKGCFG! KS_CFLAGS KS_LDFLAGS keystone
 
 SUBDIRS ./config.mk ;

keystone/keystone.c

@@ -1,23 +1,30 @@
 /* radare2-keystone - GPL - Copyright 2016 - pancake */
 
-static void *oldcur = NULL;
-static ks_engine *ks = NULL;
-static int oldbit = 0;
+#if R2_VERSION_NUMBER >= 50709
+#define ATTSYNTAX R_ARCH_SYNTAX_ATT
+#else
+#define ATTSYNTAX R_ASM_SYNTAX_ATT
+#endif
 
-static int keystone_assemble(RAsm *a, RAsmOp *ao, const char *str, ks_arch arch, ks_mode mode) {
+#include <r_th.h>
+
+static R_TH_LOCAL void *oldcur = NULL;
+static R_TH_LOCAL ks_engine *ks = NULL;
+static R_TH_LOCAL int oldbit = 0;
+
+static bool keystone_assemble(RArchSession *a, RAnalOp *ao, const char *str, ks_arch arch, ks_mode mode) {
 	ks_err err = KS_ERR_ARCH;
-	size_t count;
-	size_t size;
 	bool must_init = false;
+	size_t count, size;
 	ut8 *insn = NULL;
 
 	if (!ks_arch_supported (arch)) {
-		return -1;
+		return false;
 	}
 
 	must_init = true; //!oldcur || (a->cur != oldcur || oldbit != a->bits);
-	oldcur = a->cur;
-	oldbit = a->bits;
+	// oldcur = a->cur;
+	oldbit = a->config->bits;
 
 	if (must_init) {
 		if (ks) {
@@ -26,31 +33,45 @@ static int keystone_assemble(RAsm *a, RAsmOp *ao, const char *str, ks_arch arch,
 		}
 		err = ks_open (arch, mode, &ks);
 		if (err || !ks) {
-			eprintf ("Cannot initialize keystone\n");
-			size = -1;
-			goto beach;
+			R_LOG_ERROR ("Cannot initialize keystone");
+			ks_free (insn);
+			if (ks) {
+				ks_close (ks);
+				ks = NULL;
+			}
+			return false;
 		}
 	}
 
 	if (!ks) {
-		size = -1;
-		goto beach;
+		ks_free (insn);
+		if (ks) {
+			ks_close (ks);
+			ks = NULL;
+		}
+		return false;
 	}
-	if (a->syntax == R_ASM_SYNTAX_ATT) {
+	if (a->config->syntax == ATTSYNTAX) {
 		ks_option (ks, KS_OPT_SYNTAX, KS_OPT_SYNTAX_ATT);
 	} else {
 		ks_option (ks, KS_OPT_SYNTAX, KS_OPT_SYNTAX_NASM);
 	}
-	int rc = ks_asm (ks, str, a->pc, &insn, &size, &count);
+	int rc = ks_asm (ks, str, ao->addr, &insn, &size, &count);
 	if (rc) {
-		eprintf ("%s\n", ks_strerror ((ks_err)ks_errno (ks)));
-		size = -1;
-		goto beach;
+		eprintf ("ks_asm: (%s) %s\n", str, ks_strerror ((ks_err)ks_errno (ks)));
+		ks_free (insn);
+		if (ks) {
+			ks_close (ks);
+			ks = NULL;
+		}
+		return false;
 	}
-	memcpy (ao->buf, insn, size);
-beach:
+	ao->size = size;
+	ao->bytes = r_mem_dup (insn, size);
 	ks_free (insn);
-	ks_close (ks);
-	ks = NULL;
-	return size;
+	if (ks) {
+		ks_close (ks);
+		ks = NULL;
+	}
+	return size > 0;
 }

libr/Makefile

@@ -4,12 +4,79 @@ bea:
 	$(MAKE) -C asm bea
 	$(MAKE) -C anal bea
 
+atombios:
+	$(MAKE) -C asm atombios
+	$(MAKE) -C anal atombios
+	$(MAKE) -C bin atombios
+
+ba2:
+	$(MAKE) -C asm ba2	
+	$(MAKE) -C anal ba2
+
+blackfin:
+	$(MAKE) -C asm blackfin
+
+tab:
+	$(MAKE) -C asm tab
+
+olly:
+	$(MAKE) -C asm olly
+
+udis udis86:
+	$(MAKE) -C asm x86_udis
+	$(MAKE) -C anal x86_udis
+
+m68k:
+	$(MAKE) -C asm m68k_net
+	$(MAKE) -C anal m68k_net
+
+zyan:
+	$(MAKE) -C asm zyan
+
+evm:
+	$(MAKE) -C io evm
+nios:
+	$(MAKE) -C anal nios
+
 clean:
 	$(MAKE) -C asm clean
 	$(MAKE) -C anal clean
 
+atombios-install:
+	cp -f asm/p/asm_atombios.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f anal/p/anal_atombios.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f bin/p/bin_atombios.$(LIBEXT) $(R2PM_PLUGDIR)
+
+ba2-install:
+	cp -f asm/p/asm_ba2.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f anal/p/anal_ba2.$(LIBEXT) $(R2PM_PLUGDIR)
+
 bea-install:
 	cp -f asm/p/asm_x86_bea.$(LIBEXT) $(R2PM_PLUGDIR)
 	cp -f anal/p/anal_x86_bea.$(LIBEXT) $(R2PM_PLUGDIR)
 
+udis86-install udis-install:
+	cp -f asm/p/asm_x86_udis.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f anal/p/anal_x86_udis.$(LIBEXT) $(R2PM_PLUGDIR)
+
+tab-install:
+	cp -f asm/p/asm_x86_tab.$(LIBEXT) $(R2PM_PLUGDIR)
+
+olly-install:
+	cp -f asm/p/asm_x86_olly.$(LIBEXT) $(R2PM_PLUGDIR)
+
+m68k-install:
+	cp -f asm/p/asm_m68k_net.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f anal/p/anal_m68k_net.$(LIBEXT) $(R2PM_PLUGDIR)
+
+zyan-install:
+	cp -f asm/p/asm_x86_zyan.$(LIBEXT) $(R2PM_PLUGDIR)
+
+evm-install:
+	cp -f io/p/io_evm.$(LIBEXT) $(R2PM_PLUGDIR)
+
+nios-install:
+	cp -f asm/p/asm_nios.$(LIBEXT) $(R2PM_PLUGDIR)
+	cp -f anal/p/anal_nios.$(LIBEXT) $(R2PM_PLUGDIR)
+
 include ../options.mk

libr/anal/Makefile

@@ -1,7 +1,30 @@
+rl78:
+	$(MAKE) -C p anal_rl78.$(LIBEXT)
+	cp -f p/anal_rl78.$(LIBEXT) $(shell r2 -H R2_USER_PLUGINS)
+
+ba2:
+	cd p ; $(MAKE) anal_ba2.$(LIBEXT)
+
 bea:
 	cd p ; $(MAKE) anal_x86_bea.$(LIBEXT)
 
+x86_udis udis udis86:
+	cd p ; $(MAKE) anal_x86_udis.$(LIBEXT)
+
+m68k_net:
+	cd p ; $(MAKE) anal_m68k_net.$(LIBEXT)
+
+atombios:
+	cd p ; $(MAKE) anal_atombios.$(LIBEXT)
+
+nios:
+	cd p ; $(MAKE) anal_nios.$(LIBEXT)
+
 clean:
+	rm -f p/anal_ba2.$(LIBEXT)
 	rm -f p/anal_x86_bea.$(LIBEXT)
+	rm -f p/anal_m68k_net.$(LIBEXT)
+	rm -f p/anal_atombios.{$(LIBEXT),o}
+	rm -f p/anal_nios.$(LIBEXT)
 
 include ../../options.mk

libr/anal/arch/rl78/rl78-dis.c

@@ -0,0 +1,433 @@
+/* Disassembler code for Renesas RL78.
+   Copyright (C) 2011-2022 Free Software Foundation, Inc.
+   Contributed by Red Hat.
+   Written by DJ Delorie.
+
+   This file is part of the GNU opcodes library.
+
+   This library 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.
+
+   It 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.  */
+
+#include "sysdep.h"
+#include <stdio.h>
+
+#include "bfd.h"
+#include "elf-bfd.h"
+#include "dis-asm.h"
+#include "opcode/rl78.h"
+// #include "elf/rl78.h"
+
+#include <setjmp.h>
+
+#define DEBUG_SEMANTICS 0
+
+typedef struct
+{
+  bfd_vma pc;
+  disassemble_info * dis;
+} RL78_Data;
+
+#if 0
+struct private
+{
+  OPCODES_SIGJMP_BUF bailout;
+};
+#endif
+
+static int
+rl78_get_byte (void * vdata)
+{
+  bfd_byte buf[1];
+  RL78_Data *rl78_data = (RL78_Data *) vdata;
+  int status;
+
+  status = rl78_data->dis->read_memory_func (rl78_data->pc,
+					     buf,
+					     1,
+					     rl78_data->dis);
+#if 0
+  if (status != 0)
+    {
+      struct private *priv = (struct private *) rl78_data->dis->private_data;
+
+      rl78_data->dis->memory_error_func (status, rl78_data->pc,
+					 rl78_data->dis);
+      OPCODES_SIGLONGJMP (priv->bailout, 1);
+    }
+#endif
+
+  rl78_data->pc ++;
+  return buf[0];
+}
+
+static char const *
+register_names[] =
+{
+  "",
+  "x", "a", "c", "b", "e", "d", "l", "h",
+  "ax", "bc", "de", "hl",
+  "sp", "psw", "cs", "es", "pmc", "mem"
+};
+
+static char const *
+condition_names[] =
+{
+  "t", "f", "c", "nc", "h", "nh", "z", "nz"
+};
+
+static int
+indirect_type (int t)
+{
+  switch (t)
+    {
+    case RL78_Operand_Indirect:
+    case RL78_Operand_BitIndirect:
+    case RL78_Operand_PostInc:
+    case RL78_Operand_PreDec:
+      return 1;
+    default:
+      return 0;
+    }
+}
+
+static int
+print_insn_rl78_common (bfd_vma addr, disassemble_info * dis, RL78_Dis_Isa isa)
+{
+  int rv;
+  RL78_Data rl78_data;
+  RL78_Opcode_Decoded opcode;
+  const char * s;
+#if DEBUG_SEMANTICS
+  static char buf[200];
+#endif
+  // struct private priv;
+
+  // dis->private_data = (PTR) &priv;
+  rl78_data.pc = addr;
+  rl78_data.dis = dis;
+
+#if 0
+  if (OPCODES_SIGSETJMP (priv.bailout) != 0)
+    {
+      /* Error return.  */
+      return -1;
+    }
+#endif
+
+  rv = rl78_decode_opcode (addr, &opcode, rl78_get_byte, &rl78_data, isa);
+
+  dis->bytes_per_line = 10;
+
+#define PR (dis->fprintf_func)
+#define PS (dis->stream)
+#define PC(c) PR (PS, "%c", c)
+
+  s = opcode.syntax;
+
+#if DEBUG_SEMANTICS
+
+  switch (opcode.id)
+    {
+    case RLO_unknown: s = "uknown"; break;
+    case RLO_add: s = "add: %e0%0 += %e1%1"; break;
+    case RLO_addc: s = "addc: %e0%0 += %e1%1 + CY"; break;
+    case RLO_and: s = "and: %e0%0 &= %e1%1"; break;
+    case RLO_branch: s = "branch: pc = %e0%0"; break;
+    case RLO_branch_cond: s = "branch_cond: pc = %e0%0 if %c1 / %e1%1"; break;
+    case RLO_branch_cond_clear: s = "branch_cond_clear: pc = %e0%0 if %c1 / %e1%1, %e1%1 = 0"; break;
+    case RLO_call: s = "call: pc = %e1%0"; break;
+    case RLO_cmp: s = "cmp: %e0%0 - %e1%1"; break;
+    case RLO_mov: s = "mov: %e0%0 = %e1%1"; break;
+    case RLO_or: s = "or: %e0%0 |= %e1%1"; break;
+    case RLO_rol: s = "rol: %e0%0 <<= %e1%1"; break;
+    case RLO_rolc: s = "rol: %e0%0 <<= %e1%1,CY"; break;
+    case RLO_ror: s = "ror: %e0%0 >>= %e1%1"; break;
+    case RLO_rorc: s = "ror: %e0%0 >>= %e1%1,CY"; break;
+    case RLO_sar: s = "sar: %e0%0 >>= %e1%1 signed"; break;
+    case RLO_sel: s = "sel: rb = %1"; break;
+    case RLO_shr: s = "shr: %e0%0 >>= %e1%1 unsigned"; break;
+    case RLO_shl: s = "shl: %e0%0 <<= %e1%1"; break;
+    case RLO_skip: s = "skip: if %c1"; break;
+    case RLO_sub: s = "sub: %e0%0 -= %e1%1"; break;
+    case RLO_subc: s = "subc: %e0%0 -= %e1%1 - CY"; break;
+    case RLO_xch: s = "xch: %e0%0 <-> %e1%1"; break;
+    case RLO_xor: s = "xor: %e0%0 ^= %e1%1"; break;
+    }
+
+  sprintf(buf, "%s%%W%%f\t\033[32m%s\033[0m", s, opcode.syntax);
+  s = buf;
+
+#endif
+
+  for (; *s; s++)
+    {
+      if (*s != '%')
+	{
+	  PC (*s);
+	}
+      else
+	{
+	  RL78_Opcode_Operand * oper;
+	  int do_hex = 0;
+	  int do_addr = 0;
+	  int do_es = 0;
+	  int do_sfr = 0;
+	  int do_cond = 0;
+	  int do_bang = 0;
+
+	  while (1)
+	    {
+	      s ++;
+	      switch (*s)
+		{
+		case 'x':
+		  do_hex = 1;
+		  break;
+		case '!':
+		  do_bang = 1;
+		  break;
+		case 'e':
+		  do_es = 1;
+		  break;
+		case 'a':
+		  do_addr = 1;
+		  break;
+		case 's':
+		  do_sfr = 1;
+		  break;
+		case 'c':
+		  do_cond = 1;
+		  break;
+		default:
+		  goto no_more_modifiers;
+		}
+	    }
+	no_more_modifiers:;
+
+	  switch (*s)
+	    {
+	    case '%':
+	      PC ('%');
+	      break;
+
+#if DEBUG_SEMANTICS
+
+	    case 'W':
+	      if (opcode.size == RL78_Word)
+		PR (PS, " \033[33mW\033[0m");
+	      break;
+
+	    case 'f':
+	      if (opcode.flags)
+		{
+		  char *comma = "";
+		  PR (PS, "  \033[35m");
+
+		  if (opcode.flags & RL78_PSW_Z)
+		    { PR (PS, "Z"); comma = ","; }
+		  if (opcode.flags & RL78_PSW_AC)
+		    { PR (PS, "%sAC", comma); comma = ","; }
+		  if (opcode.flags & RL78_PSW_CY)
+		    { PR (PS, "%sCY", comma); comma = ","; }
+		  PR (PS, "\033[0m");
+		}
+	      break;
+
+#endif
+
+	    case '0':
+	    case '1':
+	      oper = *s == '0' ? &opcode.op[0] : &opcode.op[1];
+	    if (do_es)
+	      {
+		if (oper->use_es && indirect_type (oper->type))
+		  PR (PS, "es:");
+	      }
+
+	    if (do_bang)
+	      {
+		/* If we are going to display SP by name, we must omit the bang.  */
+		if ((oper->type == RL78_Operand_Indirect
+		     || oper->type == RL78_Operand_BitIndirect)
+		    && oper->reg == RL78_Reg_None
+		    && do_sfr
+		    && ((oper->addend == 0xffff8 && opcode.size == RL78_Word)
+			|| (oper->addend == 0x0fff8 && do_es && opcode.size == RL78_Word)))
+		  ;
+		else
+		  PC ('!');
+	      }
+
+	    if (do_cond)
+	      {
+		PR (PS, "%s", condition_names[oper->condition]);
+		break;
+	      }
+
+	    switch (oper->type)
+	      {
+	      case RL78_Operand_Immediate:
+		if (do_addr)
+		  dis->print_address_func (oper->addend, dis);
+		else if (do_hex
+			 || oper->addend > 999
+			 || oper->addend < -999)
+		  PR (PS, "%#x", oper->addend);
+		else
+		  PR (PS, "%d", oper->addend);
+		break;
+
+	      case RL78_Operand_Register:
+		PR (PS, "%s", register_names[oper->reg]);
+		break;
+
+	      case RL78_Operand_Bit:
+		PR (PS, "%s.%d", register_names[oper->reg], oper->bit_number);
+		break;
+
+	      case RL78_Operand_Indirect:
+	      case RL78_Operand_BitIndirect:
+		switch (oper->reg)
+		  {
+		  case RL78_Reg_None:
+		    if (oper->addend == 0xffffa && do_sfr && opcode.size == RL78_Byte)
+		      PR (PS, "psw");
+		    else if (oper->addend == 0xffff8 && do_sfr && opcode.size == RL78_Word)
+		      PR (PS, "sp");
+		    else if (oper->addend == 0x0fff8 && do_sfr && do_es && opcode.size == RL78_Word)
+		      PR (PS, "sp");
+                    else if (oper->addend == 0xffff8 && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "spl");
+                    else if (oper->addend == 0xffff9 && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "sph");
+                    else if (oper->addend == 0xffffc && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "cs");
+                    else if (oper->addend == 0xffffd && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "es");
+                    else if (oper->addend == 0xffffe && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "pmc");
+                    else if (oper->addend == 0xfffff && do_sfr && opcode.size == RL78_Byte)
+                      PR (PS, "mem");
+		    else if (oper->addend >= 0xffe20)
+		      PR (PS, "%#x", oper->addend);
+		    else
+		      {
+			int faddr = oper->addend;
+			if (do_es && ! oper->use_es)
+			  faddr += 0xf0000;
+			dis->print_address_func (faddr, dis);
+		      }
+		    break;
+
+		  case RL78_Reg_B:
+		  case RL78_Reg_C:
+		  case RL78_Reg_BC:
+		    PR (PS, "%d[%s]", oper->addend, register_names[oper->reg]);
+		    break;
+
+		  default:
+		    PR (PS, "[%s", register_names[oper->reg]);
+		    if (oper->reg2 != RL78_Reg_None)
+		      PR (PS, "+%s", register_names[oper->reg2]);
+		    if (oper->addend || do_addr)
+		      PR (PS, "+%d", oper->addend);
+		    PC (']');
+		    break;
+
+		  }
+		if (oper->type == RL78_Operand_BitIndirect)
+		  PR (PS, ".%d", oper->bit_number);
+		break;
+
+#if DEBUG_SEMANTICS
+		/* Shouldn't happen - push and pop don't print
+		   [SP] directly.  But we *do* use them for
+		   semantic debugging.  */
+	      case RL78_Operand_PostInc:
+		PR (PS, "[%s++]", register_names[oper->reg]);
+		break;
+	      case RL78_Operand_PreDec:
+		PR (PS, "[--%s]", register_names[oper->reg]);
+		break;
+#endif
+
+	      default:
+		/* If we ever print this, that means the
+		   programmer tried to print an operand with a
+		   type we don't expect.  Print the line and
+		   operand number from rl78-decode.opc for
+		   them.  */
+		PR (PS, "???%d.%d", opcode.lineno, *s - '0');
+		break;
+	      }
+	    }
+	}
+    }
+
+#if DEBUG_SEMANTICS
+
+  PR (PS, "\t\033[34m(line %d)\033[0m", opcode.lineno);
+
+#endif
+
+  return rv;
+}
+
+int
+print_insn_rl78 (bfd_vma addr, disassemble_info * dis)
+{
+  return print_insn_rl78_common (addr, dis, RL78_ISA_DEFAULT);
+}
+
+int
+print_insn_rl78_g10 (bfd_vma addr, disassemble_info * dis)
+{
+  return print_insn_rl78_common (addr, dis, RL78_ISA_G10);
+}
+
+int
+print_insn_rl78_g13 (bfd_vma addr, disassemble_info * dis)
+{
+  return print_insn_rl78_common (addr, dis, RL78_ISA_G13);
+}
+
+int
+print_insn_rl78_g14 (bfd_vma addr, disassemble_info * dis)
+{
+  return print_insn_rl78_common (addr, dis, RL78_ISA_G14);
+}
+
+#if 0
+disassembler_ftype
+rl78_get_disassembler (bfd *abfd)
+{
+  int cpu = E_FLAG_RL78_ANY_CPU;
+
+  if (abfd != NULL)
+    cpu = abfd->tdata.elf_obj_data->elf_header->e_flags & E_FLAG_RL78_CPU_MASK;
+
+  switch (cpu)
+    {
+    case E_FLAG_RL78_G10:
+      return print_insn_rl78_g10;
+    case E_FLAG_RL78_G13:
+      return print_insn_rl78_g13;
+    case E_FLAG_RL78_G14:
+      return print_insn_rl78_g14;
+    default:
+      return print_insn_rl78;
+    }
+}
+#endif

libr/anal/p/Makefile

@@ -1,7 +1,13 @@
 ARCHS=
 
+ARCHS+=ba2.mk
 ARCHS+=x86_bea.mk
 #ARCHS+=x86_im.mk
 ARCHS+=x86_simple.mk
+ARCHS+=x86_udis.mk
+ARCHS+=m68k_net.mk
+ARCHS+=atombios.mk
+ARCHS+=rl78.mk
+ARCHS+=nios.mk
 
 include ../../plugs.mk