diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | bruiser/bruiser.cpp | 1 | ||||
| -rw-r--r-- | bruiser/bruiser.h | 2 | ||||
| -rw-r--r-- | bruiser/bruiserffi.c | 101 | ||||
| -rw-r--r-- | bruiser/bruiserffi.h | 38 | ||||
| -rw-r--r-- | bruiser/makefile | 2 |
7 files changed, 151 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 882917f..0536587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,8 @@ before_script: - sudo apt-get update -qq - travis_retry sudo apt-get install clang-5.0 libclang-5.0-dev libclang-common-5.0-dev libllvm5.0 llvm-5.0-dev llvm-5.0 llvm-5.0-runtime libclang1-5.0-dbg libllvm5.0-dbg lldb-5.0 -y - sudo apt-get install gcc-4.9 g++-4.9 + - sudo apt-get install libffi -y + - sudo apt-get install libffi-devel -y - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9 - sudo apt-get install libboost-dev - git submodule init @@ -20,6 +20,7 @@ - [Announcements](#announcements) - [Buillding and Running](#building-and-running) - [Building](#building) + - [Requirements](#requirements) - [Linux and Mac](#linux-and-mac) - [Windows](#windows) - [Running](#running) @@ -138,6 +139,12 @@ All the as-of-yet implemented features of the project are very much buildable an ### Building +#### Requirements +* `LLVM/Clang` 5.0 or higher<br/> +* `libffi`<br/> +* `libpython` 3.5 or higher<br/> +The other requirements are either directly included or have to be included through `git submodule update`.<br/> + #### Linux and Mac First clone the repo and then initialize and update the submodule in it:<br/> diff --git a/bruiser/bruiser.cpp b/bruiser/bruiser.cpp index 17e2a51..00076d1 100644 --- a/bruiser/bruiser.cpp +++ b/bruiser/bruiser.cpp @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.* #include "mutagen.h" #include "ORCmutation.h" #include "executioner.h" +#include "bruiserffi.h" /*standard headers*/ #include <fstream> #include <string> diff --git a/bruiser/bruiser.h b/bruiser/bruiser.h index ed7fe85..616f2c8 100644 --- a/bruiser/bruiser.h +++ b/bruiser/bruiser.h @@ -77,7 +77,7 @@ namespace bruiser #define BOLD 1 #define NO_BOLD 0 -#define SHELL_HISTORY_SIZE 100 +#define SHELL_HISTORY_SIZE 10000 #define SHELL_HISTORY_FILE "bruiser-history.txt" #define GLOBAL_TIME_OUT 100000 diff --git a/bruiser/bruiserffi.c b/bruiser/bruiserffi.c new file mode 100644 index 0000000..d4d531d --- /dev/null +++ b/bruiser/bruiserffi.c @@ -0,0 +1,101 @@ + +/***************************************************Project Mutator****************************************************/ +/*first line intentionally left blank.*/ +/*bruiser's libffi side for calling xobjects*/ +/*Copyright (C) 2018 Farzad Sadeghi + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/ +/**********************************************************************************************************************/ +#include <ffi.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include "bruiserffi.h" +/**********************************************************************************************************************/ +ffi_type* ffi_type_ctor(const char* arg_string) { + if (strcmp(arg_string, "void") == 0) {return &ffi_type_void;} + else if (strcmp(arg_string, "uint8") == 0) {return &ffi_type_uint8;} + else if (strcmp(arg_string, "sint8") == 0) {return &ffi_type_sint8;} + else if (strcmp(arg_string, "uint16") == 0) {return &ffi_type_uint16;} + else if (strcmp(arg_string, "sint16") == 0) {return &ffi_type_sint16;} + else if (strcmp(arg_string, "uint32") == 0) {return &ffi_type_uint32;} + else if (strcmp(arg_string, "sint32") == 0) {return &ffi_type_sint32;} + else if (strcmp(arg_string, "uint64") == 0) {return &ffi_type_uint64;} + else if (strcmp(arg_string, "sint64") == 0) {return &ffi_type_sint64;} + else if (strcmp(arg_string, "float") == 0) {return &ffi_type_float;} + else if (strcmp(arg_string, "double") == 0) {return &ffi_type_double;} + else if (strcmp(arg_string, "pointer") == 0) {return &ffi_type_pointer;} + // @DEVI-FIXME: currently we are not handling structs at all + else if (strcmp(arg_string, "struct") == 0) {return &ffi_type_pointer;} + else { + fprintf(stderr, "garbage arg type was passed.\n"); + return NULL; + } +} + +void* ffi_callX(int argc, const char** arg_string, ffi_type rtype, void* x_ptr, const char* ret_type) { + ffi_status status; + ffi_cif cif; + ffi_type* args_types[argc]; + for (int i = 0; i < argc; ++i) { + if (ffi_type_ctor(arg_string[i])) args_types[i] = ffi_type_ctor(arg_string[i]); + } + + //status = ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argc, &rtype, args); + status = ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argc, &ffi_type_uint32, args_types); + if (status == FFI_BAD_TYPEDEF) { + fprintf(stderr, "ffi_prep_cif returned FFI_BAD_TYPEDEF: %d\n", status); + return NULL; + } else if (status == FFI_BAD_ABI) { + fprintf(stderr, "ffi_prep_cif returned FFI_BAD_ABI: %d\n", status); + return NULL; + } else if (status == FFI_OK) { + fprintf(stderr, "ffi_prep_cif returned FFI_OK: %d\n", status); + } else { + fprintf(stderr, "ffi_prep_cif returned an error: %d\n", status); + return NULL; + } + + uint32_t a = 30; + uint32_t b = 20; + void* ret; + //void* values[argc]; //FIXME the actual arguments + void* values[2] = {&a, &b}; + ffi_call(&cif, FFI_FN(x_ptr), &ret, values); + return ret; +} + +void* ffi_callX_var(int argc, const char** arg_string, ffi_type rtype, void* x_ptr, const char* ret_type) {} +/**********************************************************************************************************************/ +// @DEVI-the following lines are only meant for testing. +uint32_t add2(uint32_t a, uint32_t b) {return a+b;} +uint32_t sub2(uint32_t a, uint32_t b) {return a-b;} +int main(int argc, char** argv) { + void* padd = &add2; + void* psub = &sub2; + int argcount = 2; + ffi_type ret_type = ffi_type_uint32; + const char* args[] = {"uint32", "uint32"}; + const char* ret_string = "uint32"; + + void* result = ffi_callX(argcount, args, ret_type, psub, ret_string); + fprintf(stdout, "first result %d\n", (uint32_t)result); + result = ffi_callX(argcount, args, ret_type, padd, ret_string); + fprintf(stdout, "first result %d\n", (uint32_t)result); + return 0; +} +/**********************************************************************************************************************/ +/*last line intentionally left blank.*/ + diff --git a/bruiser/bruiserffi.h b/bruiser/bruiserffi.h new file mode 100644 index 0000000..0f98d2c --- /dev/null +++ b/bruiser/bruiserffi.h @@ -0,0 +1,38 @@ + +/***************************************************Project Mutator****************************************************/ +/*first line intentionally left blank.*/ +/*bruiser's libffi side for calling xobjects*/ +/*Copyright (C) 2018 Farzad Sadeghi + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/ +/**********************************************************************************************************************/ +#include <ffi.h> +/**********************************************************************************************************************/ +#ifndef BRUISER_FFI_H +#define BRUISER_FFI_H + +#ifdef __cplusplus +extern "C" { +#endif +ffi_type* ffi_type_ctor(const char* arg_string); +void* ffi_callX(int argc, const char** arg_string, ffi_type rtype, void* x_ptr, const char* ret_type); +void* ffi_callX_var(int argc, const char** arg_string, ffi_type rtype, void* x_ptr, const char* ret_type); +#ifdef __cplusplus +} +#endif +#endif +/**********************************************************************************************************************/ +/*last line intentionally left blank.*/ + diff --git a/bruiser/makefile b/bruiser/makefile index 9bc142f..20d0956 100644 --- a/bruiser/makefile +++ b/bruiser/makefile @@ -13,7 +13,7 @@ HEADER_LIST=bruiser.h bruiser-extra.h CompletionHints.h SRCS=bruiser.cpp, CompletionHints.cpp, ORCmutation.cpp, mutagen.cpp #for some reason without ld the build fails on ubuntu trusty on travis #EXTRA_LD_FLAGS+=-lpthread -ldl -lutil -lm -Xlinker -lpython3 -EXTRA_LD_FLAGS+=$(shell $(PY_CONF) --ldflags) +EXTRA_LD_FLAGS+=$(shell $(PY_CONF) --ldflags) -lffi ######################################RULES#################################### .DEFAULT: all |