From 2198478cd22cec4ea2b645d4e9f31ee9c2508ff5 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Tue, 9 Oct 2018 08:49:46 +0300 Subject: push for remote work --- misc/filespec.vim | 59 ++++++++++++++++++++ misc/radare2/Makefile | 30 ++++++++++ misc/radare2/asm_fspec.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 misc/filespec.vim create mode 100644 misc/radare2/Makefile create mode 100644 misc/radare2/asm_fspec.c (limited to 'misc') diff --git a/misc/filespec.vim b/misc/filespec.vim new file mode 100644 index 0000000..15664d7 --- /dev/null +++ b/misc/filespec.vim @@ -0,0 +1,59 @@ +" Vim syntax file +" Language: Filespec +" Author: Jari Vetoniemi + +syntax clear + +syn match fsBadContinuation contained "\\\s\+$" +syn keyword fsTodo contained TODO FIXME XXX +syn cluster fsCommentGroup contains=fsTodo,fsBadContinuation +syn region fsComment start="//" skip="\\$" end="$" keepend contains=@fsCommentGroup,@Spell + +syn keyword fsKeyword select until +syn keyword fsStructure enum struct +syn keyword fsConstant nul dec hex str true false +syn match fsPrimitive "[su][1-9][0-9]*" + +syn case ignore +syn match fsNumbers display transparent "\<\d\|\.\d" contains=fsNumber,fsFloat,fsOctalError,fsOctal +syn match fsNumbersCom display contained transparent "\<\d\|\.\d" contains=fsNumber,fsFloat,fsOctal +syn match fsNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>" +syn match fsNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" +syn match fsOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=fsOctalZero +syn match fsOctalZero display contained "\<0" +syn match fsFloat display contained "\d\+f" +syn match fsFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" +syn match fsFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" +syn match fsFloat display contained "\d\+e[-+]\=\d\+[fl]\=\>" +syn match fsOctalError display contained "0\o*[89]\d*" +syn case match + +syn match fsSpecial display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)" +syn match fsString1 "'[^']*'" contains=fsSpecial +syn match fsString2 '"[^"]*"' contains=fsSpecial +syn match fsBinary "0b[0-1x]\+" + +syn match fsBlock "[{}]" +syn match fsBracket "[\[\]]" +syn match fsOperator display "[-+&|<>=!*\/~.,;:%&^?()]" contains=fsComment + +" Define the default highlighting. +" Only used when an item doesn't have highlighting yet +hi def link fsTodo Todo +hi def link fsComment Comment +hi def link fsKeyword Keyword +hi def link fsStructure Structure +hi def link fsPrimitive Type +hi def link fsConstant Constant +hi def link fsBinary Number +hi def link fsNumber Number +hi def link fsOctal Number +hi def link fsOctalZero PreProc +hi def link fsFloat Float +hi def link fsOctalError Error +hi def link fsString1 Character +hi def link fsString2 Character +hi def link fsSpecial SpecialChar +hi def link fsBlock Constant +hi def link fsBracket Constant +hi def link fsOperator Operator diff --git a/misc/radare2/Makefile b/misc/radare2/Makefile new file mode 100644 index 0000000..aff2fdb --- /dev/null +++ b/misc/radare2/Makefile @@ -0,0 +1,30 @@ +MAKEFLAGS += --no-builtin-rules +R2_PLUGIN_PATH ?= $(shell r2 -H R2_USER_PLUGINS) + +# GCC 7: -Wstringop-overflow=, -Walloc-size-larger-than=, -Wduplicated-{branches,cond} +WARNINGS := -Wall -Wextra -Wformat=2 -Wstrict-aliasing=3 -Wstrict-overflow=5 -Wstack-usage=12500 \ + -Wfloat-equal -Wcast-align -Wpointer-arith -Wchar-subscripts -Warray-bounds=2 + +override CFLAGS ?= -g +override CFLAGS += -std=c11 $(WARNINGS) + +libs = asm_fspec.so +all: $(libs) + +%.so: + $(LINK.c) -fPIC -shared $(filter %.c,$^) $(LDLIBS) -o $@ + +asm_fspec.so: private CFLAGS += $(shell pkg-config --cflags r_anal) +asm_fspec.so: private LDLIBS += $(shell pkg-config --libs-only-l r_anal) +asm_fspec.so: asm_fspec.c + +install: $(libs) + install -Dm755 $^ -t "$(R2_PLUGIN_PATH)" + +uninstall: + $(RM) "$(R2_PLUGIN_PATH)"/asm_fspec.so + +clean: + $(RM) $(libs) + +.PHONY: all clean install uninstall diff --git a/misc/radare2/asm_fspec.c b/misc/radare2/asm_fspec.c new file mode 100644 index 0000000..fa7c1ad --- /dev/null +++ b/misc/radare2/asm_fspec.c @@ -0,0 +1,142 @@ +/* radare - LGPL - Copyright 2018 - Jari Vetoniemi */ + +#include +#include +#include +#include +#include +#include + +enum fspec_instruction { + INS_VERSION, + INS_REG, + INS_PUSH, + INS_PUSHR, + INS_STORE, + INS_OP, + INS_QUEUE, + INS_IO, + INS_EXEC, + INS_CALL, + INS_JMP, + INS_JMPIF +}; + +enum fspec_operation { + OP_UNM, + OP_LNOT, + OP_BNOT, + OP_MUL, + OP_DIV, + OP_MOD, + OP_ADD, + OP_SUB, + OP_SHIFTL, + OP_SHIFTR, + OP_LESS, + OP_LESSEQ, + OP_EQ, + OP_NOTEQ, + OP_BAND, + OP_BOR, + OP_BXOR, + OP_LAND, + OP_LOR, + OP_CTERNARY, + OP_SUBSCRIPT +}; + +static const char* +ins_name_str(const enum fspec_instruction name) +{ + switch (name) { + case INS_VERSION: return "version"; + case INS_REG: return "reg"; + case INS_PUSH: return "push"; + case INS_PUSHR: return "pushr"; + case INS_STORE: return "store"; + case INS_OP: return "op"; + case INS_QUEUE: return "queue"; + case INS_IO: return "io"; + case INS_EXEC: return "exec"; + case INS_CALL: return "call"; + case INS_JMP: return "jmp"; + case INS_JMPIF: return "jmpif"; + } + return "invalid"; +} + +static const char* +op_name_str(const enum fspec_operation op) +{ + switch (op) { + case OP_UNM: return "unm"; + case OP_LNOT: return "lnot"; + case OP_BNOT: return "bnot"; + case OP_MUL: return "mul"; + case OP_DIV: return "div"; + case OP_MOD: return "mod"; + case OP_ADD: return "add"; + case OP_SUB: return "sub"; + case OP_SHIFTL: return "shiftl"; + case OP_SHIFTR: return "shiftr"; + case OP_LESS: return "less"; + case OP_LESSEQ: return "lesseq"; + case OP_EQ: return "eq"; + case OP_NOTEQ: return "noteq"; + case OP_BAND: return "band"; + case OP_BOR: return "bor"; + case OP_BXOR: return "bxor"; + case OP_LAND: return "land"; + case OP_LOR: return "lor"; + case OP_CTERNARY: return "cternary"; + case OP_SUBSCRIPT: return "subscript"; + } + return "invalid"; +} + +static int +disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) +{ + union { + struct { unsigned name:5; unsigned n:2; uint64_t v:57; } ins; + uint8_t v[16]; + } u = {0}; + + memcpy(u.v, buf, R_MIN(sizeof(u.v[0]), len)); + const uint8_t insw = sizeof(uint16_t) * (1 << u.ins.n); + memcpy(u.v, buf, R_MIN(insw, len)); + const char *buf_asm = "invalid"; + + if (u.ins.name == INS_OP) + buf_asm = sdb_fmt("%s %s", ins_name_str(u.ins.name), op_name_str(u.ins.v)); + else if (u.ins.n == 0) + buf_asm = sdb_fmt("%s 0x%02x", ins_name_str(u.ins.name), (uint16_t)u.ins.v); + else if (u.ins.n == 1) + buf_asm = sdb_fmt("%s 0x%04x", ins_name_str(u.ins.name), (uint32_t)u.ins.v); + else if (u.ins.n == 2) + buf_asm = sdb_fmt("%s 0x%08x", ins_name_str(u.ins.name), (uint64_t)u.ins.v); + else + return 0; + + r_strbuf_set(&op->buf_asm, buf_asm); + return (op->size = insw + (u.ins.name == INS_REG ? u.ins.v : 0)); +} + +RAsmPlugin r_asm_plugin_fspec = { + .name = "fspec", + .license = "LGPL3", + .desc = "fspec disassembly plugin", + .arch = "fspec", + .bits = 16 | 32 | 64, + .endian = R_SYS_ENDIAN_LITTLE, + .disassemble = disassemble +}; + +#ifndef CORELIB +R_API RLibStruct radare_plugin = { + .type = R_LIB_TYPE_ASM, + .data = &r_asm_plugin_fspec, + .version = R2_VERSION +}; +#endif -- cgit v1.2.3