gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-11-28 10:31:05 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix: enhance return type handling in generate_checked_function to support pointer types

Browse Source
This commit is contained in:
liang.he@intel.com 2025-10-20 06:18:09 +00:00
parent 2de30f7b6f
commit edefd13a8d
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ci/generate_checked_functions.py
View File

@ -13,9 +13,13 @@ def generate_checked_function(func):
params = func.type.args.params if func.type.args else [] params = func.type.args.params if func.type.args else []
# Determine the return type # Determine the return type
return_pointer = False
return_type = "void" # Default to void if no return type is specified return_type = "void" # Default to void if no return type is specified
if isinstance(func.type.type, c_ast.TypeDecl): if isinstance(func.type.type, c_ast.TypeDecl):
return_type = " ".join(func.type.type.type.names) return_type = " ".join(func.type.type.type.names)
# TODO: figure out a better way to detect typedef from pointer
if isinstance(func.type.type, c_ast.PtrDecl):
return_pointer = True
# Start building the new function # Start building the new function
new_func = [f"static inline Result {new_func_name}("] new_func = [f"static inline Result {new_func_name}("]
@ -55,36 +59,41 @@ def generate_checked_function(func):
# Call the original function # Call the original function
if return_type == "void": if return_type == "void":
new_func.append(f" {func_name}({', '.join(param_list)});") new_func.append(f" {func_name}({', '.join(param_list)});")
new_func.append(f" Result res = {{ .error_code = 0 }};")
elif has_variadic: elif has_variadic:
new_func.append(" va_start(args, " + param_list[-2] + ");") new_func.append(" va_start(args, " + param_list[-2] + ");")
new_func.append( new_func.append(
f" {return_type} original_result = {func_name}({', '.join(param_list[:-1])}, args);" f" {return_type} original_result = {func_name}({', '.join(param_list[:-1])}, args);"
) )
new_func.append(" va_end(args);") new_func.append(" va_end(args);")
new_func.append(f" Result res;") else:
new_func.append(f" if (original_result == 0) {{") new_func.append(
f" {return_type} original_result = {func_name}({', '.join(param_list)});"
)
# Handle returned values
new_func.append(f" Result res;")
if return_type == "void":
new_func.append(f" res = {{ .error_code = 0 }};")
elif return_type == "_Bool":
new_func.append(f" res.error_code = 0 ? original_result : -2;")
new_func.append(f" res.value._Bool_value = original_result;")
# if return type is a pointer or typedef from pointer
elif return_pointer:
new_func.append(f" if (original_result != NULL) {{")
new_func.append(f" res.error_code = 0;") new_func.append(f" res.error_code = 0;")
new_func.append(f" res.value.{return_type}_value = original_result;") new_func.append(f" res.value.{return_type}_value = original_result;")
new_func.append(f" }} else {{") new_func.append(f" }} else {{")
new_func.append(f" res.error_code = -2;") new_func.append(f" res.error_code = -2;")
new_func.append(f" }}") new_func.append(f" }}")
else: else:
new_func.append(
f" {return_type} original_result = {func_name}({', '.join(param_list)});"
)
new_func.append(f" Result res;")
new_func.append(f" if (original_result == 0) {{") new_func.append(f" if (original_result == 0) {{")
new_func.append(f" res.error_code = 0;") new_func.append(f" res.error_code = 0;")
new_func.append(f" res.value._Bool_value = original_result;")
new_func.append(f" res.value.{return_type}_value = original_result;")
new_func.append(f" }} else {{") new_func.append(f" }} else {{")
new_func.append(f" res.error_code = -2;") new_func.append(f" res.error_code = -2;")
new_func.append(f" }}") new_func.append(f" }}")
new_func.append(f" return res;") new_func.append(f" return res;")
new_func.append("}")
return "\n".join(new_func) return "\n".join(new_func)