aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bruiser/bruiser-extra.h1
-rw-r--r--bruiser/bruiser.cpp51
-rw-r--r--bruiser/makefile11
-rw-r--r--test/bruisertest/compile_commands.json2
-rw-r--r--test/bruisertest/makefile8
-rw-r--r--test/bruisertest/test.cpp4
6 files changed, 67 insertions, 10 deletions
diff --git a/bruiser/bruiser-extra.h b/bruiser/bruiser-extra.h
index 65d63df..9076f9d 100644
--- a/bruiser/bruiser-extra.h
+++ b/bruiser/bruiser-extra.h
@@ -119,6 +119,7 @@ std::vector<std::string> LUA_FUNCS =
"getsourcefiles",
"getpaths",
"changedirectory",
+ "yolo",
"_G",
"_VERSION",
"assert",
diff --git a/bruiser/bruiser.cpp b/bruiser/bruiser.cpp
index c8f4049..ad50e88 100644
--- a/bruiser/bruiser.cpp
+++ b/bruiser/bruiser.cpp
@@ -86,6 +86,7 @@ namespace
std::vector<std::string> SOURCE_FILES;
std::string MAKEPATH;
std::string BINPATH;
+ unsigned int HISTORY_SIZE = SHELL_HISTORY_SIZE;
};
struct ShellCache
@@ -99,6 +100,8 @@ namespace
}
/**********************************************************************************************************************/
cl::opt<bool> Intrusive("intrusive", cl::desc("If set true. bruiser will mutate the source."), cl::init(true), cl::cat(BruiserCategory), cl::ZeroOrMore);
+cl::opt<bool> CheckSystemHeader("SysHeader", cl::desc("bruiser will run through System Headers"), cl::init(false), cl::cat(BruiserCategory), cl::ZeroOrMore);
+cl::opt<bool> MainFileOnly("MainOnly", cl::desc("bruiser will only report the results that reside in the main file"), cl::init(false), cl::cat(BruiserCategory), cl::ZeroOrMore);
cl::opt<std::string> M0XMLPath("xmlpath", cl::desc("tells bruiser where to find the XML file containing the Mutator-LVL0 report."), cl::init(bruiser::M0REP), cl::cat(BruiserCategory), cl::ZeroOrMore);
cl::opt<bool> LuaJIT("jit", cl::desc("should bruiser use luajit or not."), cl::init(true), cl::cat(BruiserCategory), cl::ZeroOrMore);
cl::opt<std::string> NonCLILuaScript("lua", cl::desc("specifies a lua script for bruiser to run in non-interactive mode"), cl::init(""), cl::cat(BruiserCategory), cl::Optional);
@@ -463,6 +466,11 @@ public:
CheckSLValidity(SLE);
SLE = Devi::SourceLocationHasMacro(SLE, Rewrite);
+ if (!Devi::IsTheMatchInMainFile(MainFileOnly, MR, SL) || Devi::IsTheMatchInSysHeader(CheckSystemHeader, MR, SL))
+ {
+ return void();
+ }
+
SourceRange SR(SL, SLE);
std::string MainSig = Rewrite.getRewrittenText(SR);
@@ -495,17 +503,22 @@ class LiveListFuncs : public MatchFinder::MatchCallback
{
const clang::FunctionDecl* FD = MR.Nodes.getNodeAs<clang::FunctionDecl>("livelistfuncs");
+ SourceLocation SL = FD->getLocStart();
+ CheckSLValidity(SL);
+ SL = Devi::SourceLocationHasMacro(SL, R);
+
+ if (!Devi::IsTheMatchInMainFile(MainFileOnly, MR, SL) || Devi::IsTheMatchInSysHeader(CheckSystemHeader, MR, SL))
+ {
+ return void();
+ }
+
if (FD->hasBody())
{
Stmt* Body = FD->getBody();
SourceLocation SLBody = Body->getLocStart();
SourceLocation SLShebang = FD->getLocStart();
- //PRINT_WITH_COLOR_LB(GREEN, "begin");
- //printf(CYAN"%s", R.getRewrittenText(clang::SourceRange(SLShebang, SLBody.getLocWithOffset(-1))).c_str());
- //printf(NORMAL "\n");
PRINT_WITH_COLOR_LB(CYAN, R.getRewrittenText(clang::SourceRange(SLShebang, SLBody.getLocWithOffset(-1))).c_str());
PushToLua.push_back(R.getRewrittenText(clang::SourceRange(SLShebang, SLBody.getLocWithOffset(-1))));
- //PRINT_WITH_COLOR_LB(GREEN, "end");
}
else
{
@@ -532,6 +545,15 @@ class LiveListVars : public MatchFinder::MatchCallback
{
const clang::VarDecl* VD = MR.Nodes.getNodeAs<clang::VarDecl>("livelistvars");
+ SourceLocation SL = VD->getLocStart();
+ CheckSLValidity(SL);
+ SL = Devi::SourceLocationHasMacro(SL, R);
+
+ if (!Devi::IsTheMatchInMainFile(MainFileOnly, MR, SL) || Devi::IsTheMatchInSysHeader(CheckSystemHeader, MR, SL))
+ {
+ return void();
+ }
+
PRINT_WITH_COLOR_LB(CYAN, R.getRewrittenText(SourceRange(VD->getLocStart(), VD->getLocEnd())).c_str());
PushToLua.push_back(R.getRewrittenText(SourceRange(VD->getLocStart(), VD->getLocEnd())));
}
@@ -1156,6 +1178,7 @@ class LuaWrapper
unsigned int historysize = lua_tonumber(__ls, 1);
linenoiseHistorySetMaxLen(historysize);
+ ShellGlobalInstance.HISTORY_SIZE = historysize;
return 0;
}
@@ -1435,6 +1458,11 @@ class LuaWrapper
return 1;
}
+ int BrluiserLuaYolo(lua_State* __ls)
+ {
+ return 0;
+ }
+
#define LIST_GENERATOR(__x1) \
int List##__x1(lua_State* __ls)\
{\
@@ -1562,6 +1590,7 @@ int main(int argc, const char **argv)
lua_register(LE.GetLuaState(), "getpaths", &LuaDispatch<&LuaWrapper::BruiserLuaGetPath>);
lua_register(LE.GetLuaState(), "getsourcefiles", &LuaDispatch<&LuaWrapper::BruiserLuaGetSourceFiles>);
lua_register(LE.GetLuaState(), "changedirectory", &LuaDispatch<&LuaWrapper::BruiserLuaChangeDirectory>);
+ lua_register(LE.GetLuaState(), "yolo", &LuaDispatch<&LuaWrapper::BrluiserLuaYolo>);
/*its just regisering the List function from LuaWrapper with X-macros.*/
#define X(__x1, __x2) lua_register(LE.GetLuaState(), #__x1, &LuaDispatch<&LuaWrapper::List##__x1>);
@@ -1594,6 +1623,20 @@ int main(int argc, const char **argv)
{
linenoiseHistoryAdd(command);
linenoiseHistorySave(SHELL_HISTORY_FILE);
+ if (std::string(command).find("!", 0) == 0)
+ {
+ std::string histnumber_str = std::string(command).substr(1, std::string::npos);
+ unsigned int history_num = std::stoi(histnumber_str, 0, 10);
+ if (history_num >= ShellGlobalInstance.HISTORY_SIZE)
+ {
+ PRINT_WITH_COLOR_LB(RED, "invalid history number passed.");
+ continue;
+ }
+ else
+ {
+
+ }
+ }
LE.RunChunk(command);
linenoiseFree(command);
}
diff --git a/bruiser/makefile b/bruiser/makefile
index 136b1c6..278da47 100644
--- a/bruiser/makefile
+++ b/bruiser/makefile
@@ -9,6 +9,7 @@ LUA?=JIT
LIB_LUA=./lua-5.3.4/src/liblua.a
LIB_LUA_JIT=./LuaJIT/src/libluajit.a
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+=-ldl
######################################RULES####################################
@@ -18,7 +19,15 @@ EXTRA_LD_FLAGS+=-ldl
all: $(BRUISER)
-.cpp.o:
+depend: .bruiser.d
+
+.bruiser.d: $(SRCS)
+ rm -f ./.bruisr.d
+ $(CXX) $(CXX_FLAGS) -MMD $^ -MF ./.bruiser.d;
+
+-include ./.bruiser.d
+
+.cpp.o: depend
$(CXX) $(CXX_FLAGS) -c $< -o $@
linenoise.o:
diff --git a/test/bruisertest/compile_commands.json b/test/bruisertest/compile_commands.json
index ff36476..a70fd13 100644
--- a/test/bruisertest/compile_commands.json
+++ b/test/bruisertest/compile_commands.json
@@ -1,6 +1,6 @@
[
{
- "command": "c++ -c -o test test.cpp",
+ "command": "c++ -c -v -I/usr/lib/gcc/x86_64-redhat-linux/6.3.1/include -o test.o test.cpp",
"directory": "/home/bloodstalker/devi/hell2/test/bruisertest",
"file": "/home/bloodstalker/devi/hell2/test/bruisertest/test.cpp"
}
diff --git a/test/bruisertest/makefile b/test/bruisertest/makefile
index c8b1c3e..1b0859b 100644
--- a/test/bruisertest/makefile
+++ b/test/bruisertest/makefile
@@ -1,14 +1,18 @@
BRUISER_TEST=test
CXX?=clang++
+# you should change the include path to one that is right for you
+CXX_FLAGS=-I/usr/lib/gcc/x86_64-redhat-linux/6.3.1/include
.DEFAULT:all clean
+.PHONY:all clean $(BRUISER_TEST) help
+
all:$(BRUISER_TEST)
.cpp.o:
- $(CXX) $(CXX_FLAGS) -c $< -o $@ -I/usr/include
+ $(CXX) $(CXX_FLAGS) -c $< -o $@
-$(BRUISER_TEST): test.cpp
+$(BRUISER_TEST): test.o
$(CXX) $^ $(LD_FLAGS) -o $@
clean:
diff --git a/test/bruisertest/test.cpp b/test/bruisertest/test.cpp
index 2e39dd9..680ce56 100644
--- a/test/bruisertest/test.cpp
+++ b/test/bruisertest/test.cpp
@@ -1,5 +1,5 @@
-#if 0
+#if 1
#include <fstream>
#include <iostream>
#endif
@@ -22,7 +22,7 @@ namespace devi
int main(int argc, const char **argv)
{
-#if 0
+#if 1
std::ofstream myfile;
myfile.open("./touch");
myfile << "line one.\n";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:02:28 +0000