luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 048 not using correct directory. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-03-12 10:47:27 -07:00
parent 1d93bd08f3
commit 72d2b0d63a
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fuzzers/048-int-piplist/Makefile
View File

@ -1,16 +1,8 @@
PIP_TYPE?=pips_int
A_PIPLIST?=$(PIP_TYPE)_l.txt
PIPLIST_TCL?=$(XRAY_FUZZERS_DIR)/piplist/piplist.tcl
all: database all: database
database: $(XRAY_FUZZERS_DIR)/piplist/build/$(A_PIPLIST) include ../pip_list.mk
$(XRAY_FUZZERS_DIR)/piplist/build/$(A_PIPLIST): $(PIPLIST_TCL)
mkdir -p $(XRAY_FUZZERS_DIR)/piplist/build
cd $(XRAY_FUZZERS_DIR)/piplist/build && ${XRAY_VIVADO} -mode batch \
-source $(PIPLIST_TCL)
database: piplist
pushdb: pushdb:
true true
@ -21,8 +13,4 @@ run: database
clean: clean:
rm -rf build run.ok rm -rf build run.ok
cleanpiplist: .PHONY: all clean run database pushdb
rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
.PHONY: all clean cleanpiplist run database pushdb

14
fuzzers/pip_list.mk Normal file
View File

@ -0,0 +1,14 @@
PIP_TYPE?=pips_int
A_PIPLIST?=$(PIP_TYPE)_l.txt
PIPLIST_TCL?=$(XRAY_FUZZERS_DIR)/piplist/piplist.tcl
$(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)/$(A_PIPLIST): $(PIPLIST_TCL)
mkdir -p $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)
cd $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE) && ${XRAY_VIVADO} -mode batch -source $(PIPLIST_TCL)
piplist: $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)/$(A_PIPLIST)
cleanpiplist:
rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
.PHONY: piplist cleanpiplist

17
fuzzers/pip_loop.mk
View File

@ -12,10 +12,7 @@ endif
# Iteration number (each containing N specimens) # Iteration number (each containing N specimens)
# Driven by int_loop.sh # Driven by int_loop.sh
ITER ?= 1 ITER ?= 1
PIP_TYPE?=pips_int
MAKETODO_FLAGS ?=--pip-type pips_int --seg-type int MAKETODO_FLAGS ?=--pip-type pips_int --seg-type int
A_PIPLIST?=$(PIP_TYPE)_l.txt
PIPLIST_TCL?=$(XRAY_FUZZERS_DIR)/piplist/piplist.tcl
SPECIMENS_DEPS ?= SPECIMENS_DEPS ?=
# See int_loop_check.py # See int_loop_check.py
@ -28,6 +25,9 @@ export FUZDIR=$(shell pwd)
all: database all: database
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(SELF_DIR)/pip_list.mk
$(SPECIMENS_OK): build/todo.txt $(SPECIMENS_DEPS) $(SPECIMENS_OK): build/todo.txt $(SPECIMENS_DEPS)
mkdir -p build/$(ITER) mkdir -p build/$(ITER)
if [ -f ${FUZDIR}/generate.sh ] ; then \ if [ -f ${FUZDIR}/generate.sh ] ; then \
@ -37,12 +37,8 @@ $(SPECIMENS_OK): build/todo.txt $(SPECIMENS_DEPS)
fi fi
touch $@ touch $@
$(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)/$(A_PIPLIST): $(PIPLIST_TCL)
mkdir -p $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)
cd $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE) && ${XRAY_VIVADO} -mode batch -source $(PIPLIST_TCL)
# Used 1) to see if we are done 2) pips to try in generate.tcl # Used 1) to see if we are done 2) pips to try in generate.tcl
build/todo.txt: $(XRAY_FUZZERS_DIR)/piplist/build/$(PIP_TYPE)/$(A_PIPLIST) $(XRAY_DIR)/fuzzers/int_maketodo.py build/database/seeded build/todo.txt: piplist $(XRAY_DIR)/fuzzers/int_maketodo.py build/database/seeded
XRAY_DATABASE_DIR=${FUZDIR}/build/database \ XRAY_DATABASE_DIR=${FUZDIR}/build/database \
python3 $(XRAY_DIR)/fuzzers/int_maketodo.py \ python3 $(XRAY_DIR)/fuzzers/int_maketodo.py \
$(MAKETODO_FLAGS) |sort >build/todo_all.txt $(MAKETODO_FLAGS) |sort >build/todo_all.txt
@ -75,7 +71,4 @@ clean:
cleaniter: cleaniter:
rm -rf build/$(ITER) build/todo.txt rm -rf build/$(ITER) build/todo.txt
cleanpiplist: .PHONY: all database pushdb run clean cleaniter
rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
.PHONY: all database pushdb run clean cleaniter cleanpiplist