Skip to content

Commit b8ec55f

Browse files
committed
Merge branch 'master' into summaries
2 parents 4403904 + 5cf8b3b commit b8ec55f

File tree

5 files changed

+7
-2
lines changed

5 files changed

+7
-2
lines changed

CodeHawk/CHB/bchlib/bCHBCTypeUtil.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ let is_float_double t = match t with TFloat (FDouble, _, _) -> true | _ -> false
187187

188188
let is_pointer t = match t with TPtr _ -> true | _ -> false
189189

190+
let is_void_pointer t = match t with TPtr (TVoid _, _) -> true | _ -> false
191+
190192
let is_scalar t = (is_int t) || (is_float t) || (is_pointer t)
191193

192194
let is_pointer_to_struct t = match t with TPtr (TComp _,_) -> true | _ -> false

CodeHawk/CHB/bchlib/bCHBCTypeUtil.mli

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ val is_float_float: btype_t -> bool
136136
val is_float_double: btype_t -> bool
137137
val is_scalar: btype_t -> bool
138138
val is_pointer: btype_t -> bool
139+
val is_void_pointer: btype_t -> bool
139140
val is_unsigned: btype_t -> bool (* true if unsigned, false if signed or unknown *)
140141
val is_function_type: btype_t -> bool
141142
val is_unknown_type: btype_t -> bool

CodeHawk/CHB/bchlib/bCHVersion.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ end
9595

9696

9797
let version = new version_info_t
98-
~version:"0.6.0_20241202"
99-
~date:"2024-12-02"
98+
~version:"0.6.0_20241217"
99+
~date:"2024-12-17"
100100
~licensee: None
101101
~maxfilesize: None
102102
()

CodeHawk/CHB/bchlibarm32/bCHFnARMDictionary.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ object (self)
493493
let (vrd, rtype) =
494494
let fintf = floc#get_call_target#get_function_interface in
495495
let rtype = get_fts_returntype fintf in
496+
let rtype = if is_void_pointer rtype then t_ptrto t_uchar else rtype in
496497
let reg =
497498
if is_float rtype then
498499
let regtype =

CodeHawk/CHB/bchlibarm32/bCHFnARMTypeConstraints.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ object (self)
325325
let (rvreg, rtype) =
326326
let fintf = floc#get_call_target#get_function_interface in
327327
let rtype = get_fts_returntype fintf in
328+
let rtype = if is_void_pointer rtype then t_ptrto t_uchar else rtype in
328329
let reg =
329330
if is_float rtype then
330331
let regtype =

0 commit comments

Comments
 (0)