Skip to content

Commit b4cc07c

Browse files
committed
CHB: reorganize postcondition attributes
1 parent f7d0489 commit b4cc07c

1 file changed

Lines changed: 103 additions & 50 deletions

File tree

‎CodeHawk/CHB/bchlib/bCHAttributesFunctionSemantics.ml‎

Lines changed: 103 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,63 +1040,116 @@ let get_access_sideeffect
10401040
end
10411041

10421042

1043-
let get_chk_post_one
1043+
let get_chk_post_conditions
10441044
(name: string)
10451045
(fparams: fts_parameter_t list)
10461046
(attrparams: b_attrparam_t list): xxpredicate_t list =
10471047
let thisf = NamedConstant name in
10481048
let rv = ReturnValue thisf in
10491049
let zero = NumConstant CHNumerical.numerical_zero in
1050-
(* Resolve target term: bare predicate → return value; predicate + AInt → parameter *)
1051-
let target_result =
1052-
match attrparams with
1053-
| [ACons (pred, [])] -> Ok (pred, rv)
1054-
| [ACons (pred, []); AInt refindex] ->
1050+
let negone = NumConstant (CHNumerical.mkNumerical (-1)) in
1051+
let get_param (pl: b_attrparam_t list): bterm_t traceresult =
1052+
match pl with
1053+
| [] -> Ok rv
1054+
| [AInt 0] -> Ok rv
1055+
| [AInt refindex] when refindex > 0 ->
10551056
let* par = get_par fparams refindex in
1056-
Ok (pred, ArgValue par)
1057-
| (ACons (tag, _)) :: _ ->
1058-
Error [(elocm __LINE__) ^ "chk_post tag not recognized: " ^ tag]
1057+
Ok (ArgValue par)
10591058
| _ ->
10601059
Error [(elocm __LINE__) ^ "chk_post params not recognized";
1061-
attrparams_to_string "attrparams" attrparams] in
1062-
TR.tfold
1063-
~error:(fun e ->
1064-
begin
1065-
log_diagnostics_result
1066-
~tag:"get_chk_post_one:not recognized"
1067-
~msg:name
1068-
__FILE__ __LINE__
1069-
e;
1070-
[]
1071-
end)
1072-
~ok:(fun (pred, target) ->
1073-
let negone = NumConstant (CHNumerical.mkNumerical (-1)) in
1074-
match pred with
1075-
| "not_null" -> [XXNotNull target]
1076-
| "null" -> [XXNull target]
1077-
| "non_negative" -> [XXNonNegative target]
1078-
| "not_zero" -> [XXNotZero target]
1079-
| "positive" -> [XXPositive target]
1080-
| "null_terminated" -> [XXNullTerminated target]
1081-
| "new_memory" -> [XXNewMemory (target, RunTimeValue)]
1082-
| "allocation_base" -> [XXAllocationBase target]
1083-
| "trusted_string" -> [XXTrustedString target]
1084-
| "trusted_os_cmd_string" -> [XXTrustedOsCmdString target]
1085-
| "tainted" -> [XXTainted target]
1086-
| "negone" -> [XXRelationalExpr (PEquals, target, negone)]
1087-
| "zero" -> [XXRelationalExpr (PEquals, target, zero)]
1088-
| "negative" -> [XXRelationalExpr (PLessThan, target, zero)]
1089-
| "nonpositive" -> [XXRelationalExpr (PLessEqual, target, zero)]
1090-
| tag ->
1091-
begin
1092-
log_diagnostics_result
1093-
~tag:"get_chk_post_one:tag not recognized"
1094-
~msg:name
1095-
__FILE__ __LINE__
1096-
["tag: " ^ tag];
1097-
[]
1098-
end)
1099-
target_result
1060+
attrparams_to_string "attrparams" pl] in
1061+
let get_two_params (pl: b_attrparam_t list): (bterm_t * bterm_t) traceresult =
1062+
match pl with
1063+
| [AInt 0; AInt p2] ->
1064+
let* par = get_par fparams p2 in
1065+
Ok (rv, ArgValue par)
1066+
| [AInt p1; AInt p2] ->
1067+
let* par1 = get_par fparams p1 in
1068+
let* par2 = get_par fparams p2 in
1069+
Ok (ArgValue par1, ArgValue par2)
1070+
| _ ->
1071+
Error [(elocm __LINE__) ^ "chk_post params not recognized";
1072+
attrparams_to_string "attrparams" pl] in
1073+
let xpred =
1074+
match attrparams with
1075+
| (ACons ("not_null", [])) :: refparams ->
1076+
TR.tmap (fun t -> [XXNotNull t]) (get_param refparams)
1077+
| (ACons ("null", [])) :: refparams ->
1078+
TR.tmap (fun t -> [XXNull t]) (get_param refparams)
1079+
| (ACons ("non_negative", [])) :: refparams ->
1080+
TR.tmap (fun t -> [XXNonNegative t]) (get_param refparams)
1081+
| (ACons ("not_zero", [])) :: refparams ->
1082+
TR.tmap (fun t -> [XXNotZero t]) (get_param refparams)
1083+
| (ACons ("positive", [])) :: refparams ->
1084+
TR.tmap (fun t -> [XXPositive t]) (get_param refparams)
1085+
| (ACons ("null_terminated", [])) :: refparams ->
1086+
TR.tmap (fun t -> [XXNullTerminated t]) (get_param refparams)
1087+
| (ACons ("new_memory", [])) :: ([_; _] as refparams) ->
1088+
TR.tmap
1089+
(fun (t, sizeparam) -> [XXNewMemory (t, sizeparam)])
1090+
(get_two_params refparams)
1091+
| (ACons ("new_memory", [])) :: refparams ->
1092+
TR.tmap (fun t -> [XXNewMemory (t, RunTimeValue)]) (get_param refparams)
1093+
| (ACons ("new_memory", [AInt size])) :: refparams ->
1094+
let asize = NumConstant (CHNumerical.mkNumerical size) in
1095+
TR.tmap (fun t -> [XXNewMemory (t, asize)]) (get_param refparams)
1096+
| (ACons ("allocation_base", [])) :: refparams ->
1097+
TR.tmap (fun t -> [XXAllocationBase t]) (get_param refparams)
1098+
| (ACons ("trusted_string", [])) :: refparams ->
1099+
TR.tmap (fun t -> [XXTrustedString t]) (get_param refparams)
1100+
| (ACons ("trusted_os_cmd_string", [])) :: refparams ->
1101+
TR.tmap (fun t -> [XXTrustedOsCmdString t]) (get_param refparams)
1102+
| (ACons ("trusted_os_cmd_fmt_arg_string", [])) :: refparams ->
1103+
TR.tmap
1104+
(fun t -> [XXTrustedOsCmdFmtArgString (t, NO_QUOTES, None)])
1105+
(get_param refparams)
1106+
| (ACons ("trusted_os_cmd_fmt_arg_string", [ACons ("no_quotes", [])]))
1107+
:: refparams ->
1108+
TR.tmap
1109+
(fun t -> [XXTrustedOsCmdFmtArgString (t, NO_QUOTES, None)])
1110+
(get_param refparams)
1111+
| (ACons ("trusted_os_cmd_fmt_arg_string",
1112+
[ACons ("no_quotes", []); AInt size])) :: refparams ->
1113+
TR.tmap
1114+
(fun t -> [XXTrustedOsCmdFmtArgString (t, NO_QUOTES, Some size)])
1115+
(get_param refparams)
1116+
| (ACons ("tainted", [])) :: refparams ->
1117+
TR.tmap (fun t -> [XXTainted t]) (get_param refparams)
1118+
| (ACons ("negone", [])) :: refparams ->
1119+
TR.tmap
1120+
(fun t -> [XXRelationalExpr (PEquals, t, negone)])
1121+
(get_param refparams)
1122+
| (ACons ("zero", [])) :: refparams ->
1123+
TR.tmap
1124+
(fun t -> [XXRelationalExpr (PEquals, t, zero)])
1125+
(get_param refparams)
1126+
| (ACons ("negative", [])) :: refparams ->
1127+
TR.tmap
1128+
(fun t -> [XXRelationalExpr (PLessThan, t, zero)])
1129+
(get_param refparams)
1130+
| (ACons ("nonpositive", [])) :: refparams ->
1131+
TR.tmap
1132+
(fun t -> [XXRelationalExpr (PLessEqual, t, zero)])
1133+
(get_param refparams)
1134+
| (ACons (tag, _)) :: _ ->
1135+
Error [(elocm __LINE__)
1136+
^ "chk_post tag " ^ tag ^ " not recognized in "
1137+
^ (attrparams_to_string "argparams" attrparams)]
1138+
| _ ->
1139+
Error [(elocm __LINE__)
1140+
^ "chk_post attrparams not recognized: "
1141+
^ (attrparams_to_string "argparams" attrparams)] in
1142+
match xpred with
1143+
| Ok xl -> xl
1144+
| Error e ->
1145+
begin
1146+
log_error_result
1147+
~tag:"get_check_post_conditions"
1148+
~msg:name
1149+
__FILE__ __LINE__
1150+
[String.concat "; " e];
1151+
[]
1152+
end
11001153

11011154

11021155
let get_chk_qual_conditions
@@ -1184,11 +1237,11 @@ let convert_b_attributes_to_function_conditions
11841237
(xpre, side @ xside, xpost, xepost, xqual)
11851238

11861239
| Attr ("chk_post", attrparams) ->
1187-
let post = get_chk_post_one name fparameters attrparams in
1240+
let post = get_chk_post_conditions name fparameters attrparams in
11881241
(xpre, xside, post @ xpost, xepost, xqual)
11891242

11901243
| Attr ("chk_epost", attrparams) ->
1191-
let epost = get_chk_post_one name fparameters attrparams in
1244+
let epost = get_chk_post_conditions name fparameters attrparams in
11921245
(xpre, xside, xpost, epost @ xepost, xqual)
11931246

11941247
| Attr ("chk_qual", attrparams) ->

0 commit comments

Comments
 (0)