Skip to content

Functionannotations #175

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.

Sign up for GitHub

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

Merged
sipma merged 3 commits into from
Feb 5, 2025
Merged

Functionannotations #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
358045f
Merge branch 'sipma-summaries'
sipma Feb 4, 2025
ce3f85c
Merge remote-tracking branch 'sae/master'
sipma Feb 4, 2025
33a7858
CHB: fix traversal through field offsets
sipma Feb 5, 2025
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
6 changes: 4 additions & 2 deletions CodeHawk/CHB/bchlib/bCHMemoryReference.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ and get_field_memory_offset_at
Error [__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": "
^ "Skipped over field: "
^ (string_of_int offset)]
else if offset > (foff + sz) then
else if offset >= (foff + sz) then
Ok None
else
let offset = offset - foff in
Expand Down Expand Up @@ -369,7 +369,9 @@ and get_field_memory_offset_at
Error [__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": "
^ "Nonzero offset: " ^ (string_of_int offset)
^ " with unstructured field type: "
^ (btype_to_string fldtype)])
^ (btype_to_string fldtype)
^ " for field "
^ finfo.bfname])
(resolve_type finfo.bftype)) (Ok None) finfos in
(match optfield_r with
| Error e -> Error e
Expand Down
4 changes: 4 additions & 0 deletions CodeHawk/CHB/bchlib/bCHVariable.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,10 @@ object (self)
(cv1: constant_value_variable_t)
(cv2: constant_value_variable_t) =
match (cv1, cv2) with
| (TypeCastValue _, TypeCastValue _) -> Stdlib.compare ix1 ix2
| (TypeCastValue _, _) -> -1
| (_, TypeCastValue _) -> 1

| (FunctionReturnValue _, FunctionReturnValue _) -> Stdlib.compare ix1 ix2
| (FunctionReturnValue _, _) -> -1
| (_, FunctionReturnValue _) -> 1
Expand Down