Skip to content

Commit

Permalink
fix verify and defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
ailrst committed Jan 12, 2024
1 parent 0073c9a commit ec98020
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/main/scala/Main.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ object Main {
analysisResultsDot: Option[String]
)

def main(args: Iterable[String]): Unit = {
def main(args: Array[String]): Unit = {
val parser = ParserForClass[Config]
val parsed = parser.constructEither(args.toSeq)

Expand Down
4 changes: 2 additions & 2 deletions src/test/make/lift-directories.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ NAME=$(notdir $(shell pwd))
GIT_ROOT?=$(realpath ../../../../)

GCC ?= aarch64-linux-gnu-gcc
CLANG ?= clang
CLANG ?= clang-15
CC ?= $(GCC)
#CFLAGS=-fno-pic -fno-plt
TARGET=aarch64-linux-gnu
Expand All @@ -21,7 +21,7 @@ BASIL=$(GIT_ROOT)/target/scala-3.3.1/wptool-boogie-assembly-0.0.1.jar
C_SOURCE ?=$(realpath $(wildcard *.c))
SPEC ?=$(realpath $(wildcard *.spec))
EXTRA_SPEC ?=$(realpath $(wildcard *.bpl))
BASIL_FLAGS ?= --boogie-use-lambda-stores
BASIL_FLAGS ?=
#BOOGIE_FLAGS=/proverOpt:O:smt.array.extensional=false
BOOGIE_FLAGS ?= /useArrayAxioms

Expand Down
18 changes: 12 additions & 6 deletions src/test/make/lift.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ $(LIFT_ARTEFACTS): a.out
$(BAP) a.out -d adt:$(NAME).adt -d bir:$(NAME).bir
$(READELF) -s -r -W a.out > $(NAME).relf


ifdef $(SPEC)
BASIL_SPECARG = --spec $(SPEC)
endif

# optional; create basil
$(NAME).bpl: $(LIFT_ARTEFACTS) $(SPEC) $(BASIL)
echo $(BASIL)
java -jar $(BASIL) $(BASIL_FLAGS) --adt $(NAME).adt --relf $(NAME).relf -o $(NAME).bpl --spec $(SPEC)
java -jar $(BASIL) $(BASIL_FLAGS) --adt $(NAME).adt --relf $(NAME).relf -o $(NAME).bpl $(BASIL_SPECARG)

.PHONY=$(BASIL)
$(BASIL):
Expand All @@ -27,14 +31,16 @@ recompile: a.out
$(NAME)_result.txt: $(NAME).bpl $(EXTRA_SPEC)
bash -c "time boogie $(NAME).bpl $(EXTRA_SPEC) $(BOOGIE_FLAGS) | tee $(NAME)_result.txt"

cleanall: clean cleanlift cleanbin
cleanall: clean cleanlift cleanbin cleantest

cleantest:
rm -rf $(NAME).bpl
rm -rf $(NAME)_result.txt

cleanbin:
rm -rf a.out

clean: cleanbin
rm -rf $(NAME).bpl
rm -rf $(NAME)_result.txt
clean: cleanlift cleanbin

cleanlift:
rm -rf $(NAME).adt
Expand Down

0 comments on commit ec98020

Please sign in to comment.