Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix example proof scripts that were broken by function renames (#955). #1013

Merged
merged 2 commits into from
Jan 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ install_system_deps() {
test_dist() {
find_java
pushd intTests
for t in test0001 test0019_jss_switch_statement test_crucible_jvm test_ecdsa test_examples test_issue108 test_tutorial1 test_tutorial2 test_tutorial_w4; do echo $t >> disabled_tests.txt; done
for t in test0001 test0019_jss_switch_statement test_crucible_jvm test_ecdsa test_issue108 test_tutorial1 test_tutorial2 test_tutorial_w4; do echo $t >> disabled_tests.txt; done
env
LOUD=true ./runtests.sh
sh -c "! grep '<failure>' results.xml"
Expand Down
8 changes: 4 additions & 4 deletions examples/llvm/struct.saw
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ let ptr_to_fresh n ty = do {

let set_spec = do {
(x, px) <- ptr_to_fresh "x" (llvm_array 2 (llvm_int 32));
po <- alloc_init (llvm_struct "struct.s") (llvm_struct [px]);
po <- alloc_init (llvm_struct "struct.s") (llvm_struct_value [px]);
llvm_execute_func [po];
llvm_points_to po (llvm_struct [px]);
llvm_points_to po (llvm_struct_value [px]);
llvm_points_to px (llvm_term {{ [0, 0] : [2][32] }});
};

let add_spec = do {
(x, px) <- ptr_to_fresh "x" (llvm_array 2 (llvm_int 32));
po <- alloc_init (llvm_struct "struct.s") (llvm_struct [px]);
po <- alloc_init (llvm_struct "struct.s") (llvm_struct_value [px]);
llvm_execute_func [po];
llvm_return (llvm_term {{ x@0 + x@1 }});
};

let id_spec = do {
(x, px) <- ptr_to_fresh "x" (llvm_array 2 (llvm_int 32));
po <- alloc_init (llvm_struct "struct.s") (llvm_struct [px]);
po <- alloc_init (llvm_struct "struct.s") (llvm_struct_value [px]);
llvm_execute_func [po];
llvm_return po;
};
Expand Down
2 changes: 1 addition & 1 deletion examples/salsa20/salsa.saw
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ let s20_encrypt32 n = do {
};

let main : TopLevel () = do {
m <- load_module "salsa20.bc";
m <- llvm_load_module "salsa20.bc";
qr <- llvm_verify m "s20_quarterround" [] false quarterround_setup abc;
rr <- llvm_verify m "s20_rowround" [qr] false rowround_setup abc;
cr <- llvm_verify m "s20_columnround" [qr] false columnround_setup abc;
Expand Down