Skip to content

Commit

Permalink
Remove pts_ prefix from signature relations
Browse files Browse the repository at this point in the history 
It's redundant - cclyzer++ is a pointer analysis, the signatures are *all* about
pointers.
  • Loading branch information
@langston-barrett
langston-barrett committed Oct 11, 2022
1 parent e47266e commit f2d0008
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 136 deletions.
34 changes: 17 additions & 17 deletions FactGenerator/include/predicates.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,23 +642,23 @@ GROUP_END(attr)
// Signatures

GROUP_BEGIN(signature)
PREDICATE(signature, pts_none, pts_signature_none)
PREDICATE(signature, pts_return_alloc, pts_signature_return_alloc)
PREDICATE(signature, pts_return_alloc_once, pts_signature_return_alloc_once)
PREDICATE(signature, pts_return_aliases_arg, pts_signature_return_aliases_arg)
PREDICATE(signature, pts_return_aliases_arg_reachable, pts_signature_return_aliases_arg_reachable)
PREDICATE(signature, pts_return_points_to_global, pts_signature_return_points_to_global)
PREDICATE(signature, pts_return_aliases_global, pts_signature_return_aliases_global)
PREDICATE(signature, pts_return_aliases_global_reachable, pts_signature_return_aliases_global_reachable)
PREDICATE(signature, pts_arg_alloc, pts_signature_arg_alloc)
PREDICATE(signature, pts_arg_alloc_once, pts_signature_arg_alloc_once)
PREDICATE(signature, pts_arg_memcpy_arg, pts_signature_arg_memcpy_arg)
PREDICATE(signature, pts_arg_memcpy_arg_reachable, pts_signature_arg_memcpy_arg_reachable)
PREDICATE(signature, pts_arg_points_to_global, pts_signature_arg_points_to_global)
PREDICATE(signature, pts_arg_memcpy_global, pts_signature_arg_memcpy_global)
PREDICATE(signature, pts_arg_memcpy_global_reachable, pts_signature_arg_memcpy_global_reachable)
PREDICATE(signature, pts_global_memcpy_arg, pts_signature_global_memcpy_arg)
PREDICATE(signature, pts_global_memcpy_arg_reachable, pts_signature_global_memcpy_arg_reachable)
PREDICATE2(signature, none)
PREDICATE2(signature, return_alloc)
PREDICATE2(signature, return_alloc_once)
PREDICATE2(signature, return_aliases_arg)
PREDICATE2(signature, return_aliases_arg_reachable)
PREDICATE2(signature, return_points_to_global)
PREDICATE2(signature, return_aliases_global)
PREDICATE2(signature, return_aliases_global_reachable)
PREDICATE2(signature, arg_alloc)
PREDICATE2(signature, arg_alloc_once)
PREDICATE2(signature, arg_memcpy_arg)
PREDICATE2(signature, arg_memcpy_arg_reachable)
PREDICATE2(signature, arg_points_to_global)
PREDICATE2(signature, arg_memcpy_global)
PREDICATE2(signature, arg_memcpy_global_reachable)
PREDICATE2(signature, global_memcpy_arg)
PREDICATE2(signature, global_memcpy_arg_reachable)
GROUP_END(signature)

// User options
Expand Down
34 changes: 17 additions & 17 deletions FactGenerator/src/Signatures.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,120 +142,120 @@ void emit_signatures(
}
if (signature_component_type == "pts_none") {
write_pts_signature<>(
cclyzer::predicates::signature::pts_none,
cclyzer::predicates::signature::none,
"pts_none",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_alloc") {
write_pts_signature<>(
cclyzer::predicates::signature::pts_return_alloc,
cclyzer::predicates::signature::return_alloc,
"pts_return_alloc",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_alloc_once") {
write_pts_signature<>(
cclyzer::predicates::signature::pts_return_alloc_once,
cclyzer::predicates::signature::return_alloc_once,
"pts_return_alloc_once",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_aliases_arg") {
write_pts_signature<int64_t>(
cclyzer::predicates::signature::pts_return_aliases_arg,
cclyzer::predicates::signature::return_aliases_arg,
"pts_return_aliases_arg",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_aliases_arg_reachable") {
write_pts_signature<int64_t>(
cclyzer::predicates::signature::pts_return_aliases_arg_reachable,
cclyzer::predicates::signature::return_aliases_arg_reachable,
"pts_return_aliases_arg_reachable",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_points_to_global") {
write_pts_signature<std::string>(
cclyzer::predicates::signature::pts_return_points_to_global,
cclyzer::predicates::signature::return_points_to_global,
"pts_return_points_to_global",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_return_aliases_global") {
write_pts_signature<std::string>(
cclyzer::predicates::signature::pts_return_aliases_global,
cclyzer::predicates::signature::return_aliases_global,
"pts_return_aliases_global",
function_name,
writer,
signature_component_inner_value);
} else if (
signature_component_type == "pts_return_aliases_global_reachable") {
write_pts_signature<std::string>(
cclyzer::predicates::signature::pts_return_aliases_global_reachable,
cclyzer::predicates::signature::return_aliases_global_reachable,
"pts_return_aliases_global_reachable",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_alloc") {
write_pts_signature<int64_t>(
cclyzer::predicates::signature::pts_arg_alloc,
cclyzer::predicates::signature::arg_alloc,
"pts_arg_alloc",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_alloc_once") {
write_pts_signature<int64_t>(
cclyzer::predicates::signature::pts_arg_alloc_once,
cclyzer::predicates::signature::arg_alloc_once,
"pts_arg_alloc_once",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_memcpy_arg") {
write_pts_signature<int64_t, int64_t>(
cclyzer::predicates::signature::pts_arg_memcpy_arg,
cclyzer::predicates::signature::arg_memcpy_arg,
"pts_arg_memcpy_arg",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_memcpy_arg_reachable") {
write_pts_signature<int64_t, int64_t>(
cclyzer::predicates::signature::pts_arg_memcpy_arg_reachable,
cclyzer::predicates::signature::arg_memcpy_arg_reachable,
"pts_arg_memcpy_arg_reachable",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_points_to_global") {
write_pts_signature<int64_t, std::string>(
cclyzer::predicates::signature::pts_arg_points_to_global,
cclyzer::predicates::signature::arg_points_to_global,
"pts_arg_points_to_global",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_memcpy_global") {
write_pts_signature<int64_t, std::string>(
cclyzer::predicates::signature::pts_arg_memcpy_global,
cclyzer::predicates::signature::arg_memcpy_global,
"pts_arg_memcpy_global",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_arg_memcpy_global_reachable") {
write_pts_signature<int64_t, std::string>(
cclyzer::predicates::signature::pts_arg_memcpy_global_reachable,
cclyzer::predicates::signature::arg_memcpy_global_reachable,
"pts_arg_memcpy_global_reachable",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_global_memcpy_arg") {
write_pts_signature<std::string, int64_t>(
cclyzer::predicates::signature::pts_global_memcpy_arg,
cclyzer::predicates::signature::global_memcpy_arg,
"pts_global_memcpy_arg",
function_name,
writer,
signature_component_inner_value);
} else if (signature_component_type == "pts_global_memcpy_arg_reachable") {
write_pts_signature<std::string, int64_t>(
cclyzer::predicates::signature::pts_global_memcpy_arg_reachable,
cclyzer::predicates::signature::global_memcpy_arg_reachable,
"pts_global_memcpy_arg_reachable",
function_name,
writer,
Expand Down
38 changes: 19 additions & 19 deletions datalog/export/debug-output-extended.dl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,9 @@
.output func_is_illformed (compress=true)
.output func_is_wellformed (compress=true)
.output func_linkage (compress=true)
.output func_missing_pts_signature (compress=true)
.output func_missing_signature (compress=true)
.output func_name (compress=true)
.output func_needs_pts_signature (compress=true)
.output func_needs_signature (compress=true)
.output func_nparams (compress=true)
.output func_out_degree (compress=true)
.output func_param (compress=true)
Expand Down Expand Up @@ -645,23 +645,23 @@
.output ptrtoint_instr_from_operand (compress=true)
.output ptrtoint_instr_from_type (compress=true)
.output ptrtoint_instr_to_type (compress=true)
.output pts_signature_arg_alloc (compress=true)
.output pts_signature_arg_alloc_once (compress=true)
.output pts_signature_arg_memcpy_arg (compress=true)
.output pts_signature_arg_memcpy_arg_reachable (compress=true)
.output pts_signature_arg_memcpy_global (compress=true)
.output pts_signature_arg_memcpy_global_reachable (compress=true)
.output pts_signature_arg_points_to_global (compress=true)
.output pts_signature_global_memcpy_arg (compress=true)
.output pts_signature_global_memcpy_arg_reachable (compress=true)
.output pts_signature_none (compress=true)
.output pts_signature_return_aliases_arg (compress=true)
.output pts_signature_return_aliases_arg_reachable (compress=true)
.output pts_signature_return_aliases_global (compress=true)
.output pts_signature_return_aliases_global_reachable (compress=true)
.output pts_signature_return_alloc (compress=true)
.output pts_signature_return_alloc_once (compress=true)
.output pts_signature_return_points_to_global (compress=true)
.output signature_arg_alloc (compress=true)
.output signature_arg_alloc_once (compress=true)
.output signature_arg_memcpy_arg (compress=true)
.output signature_arg_memcpy_arg_reachable (compress=true)
.output signature_arg_memcpy_global (compress=true)
.output signature_arg_memcpy_global_reachable (compress=true)
.output signature_arg_points_to_global (compress=true)
.output signature_global_memcpy_arg (compress=true)
.output signature_global_memcpy_arg_reachable (compress=true)
.output signature_none (compress=true)
.output signature_return_aliases_arg (compress=true)
.output signature_return_aliases_arg_reachable (compress=true)
.output signature_return_aliases_global (compress=true)
.output signature_return_aliases_global_reachable (compress=true)
.output signature_return_alloc (compress=true)
.output signature_return_alloc_once (compress=true)
.output signature_return_points_to_global (compress=true)
.output ptx_device_calling_convention (compress=true)
.output ptx_kernel_calling_convention (compress=true)
.output reachable_var (compress=true)
Expand Down
38 changes: 19 additions & 19 deletions datalog/export/debug-output.dl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,9 @@
.output func_is_illformed (compress=true)
.output func_is_wellformed (compress=true)
.output func_linkage (compress=true)
.output func_missing_pts_signature (compress=true)
.output func_missing_signature (compress=true)
.output func_name (compress=true)
.output func_needs_pts_signature (compress=true)
.output func_needs_signature (compress=true)
.output func_nparams (compress=true)
.output func_out_degree (compress=true)
.output func_param (compress=true)
Expand Down Expand Up @@ -645,23 +645,23 @@
.output ptrtoint_instr_from_operand (compress=true)
.output ptrtoint_instr_from_type (compress=true)
.output ptrtoint_instr_to_type (compress=true)
.output pts_signature_arg_alloc (compress=true)
.output pts_signature_arg_alloc_once (compress=true)
.output pts_signature_arg_memcpy_arg (compress=true)
.output pts_signature_arg_memcpy_arg_reachable (compress=true)
.output pts_signature_arg_memcpy_global (compress=true)
.output pts_signature_arg_memcpy_global_reachable (compress=true)
.output pts_signature_arg_points_to_global (compress=true)
.output pts_signature_global_memcpy_arg (compress=true)
.output pts_signature_global_memcpy_arg_reachable (compress=true)
.output pts_signature_none (compress=true)
.output pts_signature_return_aliases_arg (compress=true)
.output pts_signature_return_aliases_arg_reachable (compress=true)
.output pts_signature_return_aliases_global (compress=true)
.output pts_signature_return_aliases_global_reachable (compress=true)
.output pts_signature_return_alloc (compress=true)
.output pts_signature_return_alloc_once (compress=true)
.output pts_signature_return_points_to_global (compress=true)
.output signature_arg_alloc (compress=true)
.output signature_arg_alloc_once (compress=true)
.output signature_arg_memcpy_arg (compress=true)
.output signature_arg_memcpy_arg_reachable (compress=true)
.output signature_arg_memcpy_global (compress=true)
.output signature_arg_memcpy_global_reachable (compress=true)
.output signature_arg_points_to_global (compress=true)
.output signature_global_memcpy_arg (compress=true)
.output signature_global_memcpy_arg_reachable (compress=true)
.output signature_none (compress=true)
.output signature_return_aliases_arg (compress=true)
.output signature_return_aliases_arg_reachable (compress=true)
.output signature_return_aliases_global (compress=true)
.output signature_return_aliases_global_reachable (compress=true)
.output signature_return_alloc (compress=true)
.output signature_return_alloc_once (compress=true)
.output signature_return_points_to_global (compress=true)
.output ptx_device_calling_convention (compress=true)
.output ptx_kernel_calling_convention (compress=true)
.output reachable_var (compress=true)
Expand Down
Loading

0 comments on commit f2d0008

Please sign in to comment.