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

feat: enhance generate_checked_function to support variadic arguments and update Result handling

Browse Source
This commit is contained in:
liang.he@intel.com 2025-10-16 02:36:36 +00:00
parent 16d35155a5
commit 90bfd394da
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ci/generate_checked_functions.py
View File

@ -2,11 +2,6 @@ from pycparser import c_parser, c_ast, parse_file
import os import os
# Helper function to determine if a parameter is a pointer
def is_pointer(param):
return isinstance(param.type, c_ast.PtrDecl)
# Updated generate_checked_function to dynamically update Result definition for new return types # Updated generate_checked_function to dynamically update Result definition for new return types
@ -45,10 +40,13 @@ def generate_checked_function(func):
new_func.append(") {") new_func.append(") {")
# Add null checks for pointer parameters # Add null checks for pointer parameters
has_variadic = False
for param in params: for param in params:
if isinstance(param, c_ast.EllipsisParam): if isinstance(param, c_ast.EllipsisParam):
continue # Skip variadic arguments # Restructure to use va_list
if is_pointer(param): new_func.append(" va_list args;")
has_variadic = True
elif isinstance(param.type, c_ast.PtrDecl):
new_func.append(f" if ({param.name} == NULL) {{") new_func.append(f" if ({param.name} == NULL) {{")
new_func.append(f" Result res = {{ .error_code = -1 }};") new_func.append(f" Result res = {{ .error_code = -1 }};")
new_func.append(f" return res;") new_func.append(f" return res;")
@ -58,6 +56,19 @@ def generate_checked_function(func):
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 }};") new_func.append(f" Result res = {{ .error_code = 0 }};")
elif has_variadic:
new_func.append(" va_start(args, " + param_list[-2] + ");")
new_func.append(
f" {return_type} original_result = {func_name}({', '.join(param_list[:-1])}, args);"
)
new_func.append(" va_end(args);")
new_func.append(f" Result res;")
new_func.append(f" if (original_result == 0) {{")
new_func.append(f" res.error_code = 0;")
new_func.append(f" res.value.{return_type}_value = original_result;")
new_func.append(f" }} else {{")
new_func.append(f" res.error_code = -2;")
new_func.append(f" }}")
else: else:
new_func.append( new_func.append(
f" {return_type} original_result = {func_name}({', '.join(param_list)});" f" {return_type} original_result = {func_name}({', '.join(param_list)});"
@ -151,7 +162,10 @@ def process_header():
f.write("#include <stdbool.h>\n") f.write("#include <stdbool.h>\n")
f.write("#include <stdint.h>\n") f.write("#include <stdint.h>\n")
f.write("#include <stdlib.h>\n") f.write("#include <stdlib.h>\n")
f.write('#include "wasm_export.h"\n\n') f.write("\n")
f.write('#include "wasm_export.h"\n')
f.write('#include "lib_export.h"\n')
f.write("\n")
# Write the updated Result struct # Write the updated Result struct
f.write(RESULT_STRUCT + "\n") f.write(RESULT_STRUCT + "\n")