# psi_add_redir(name, symbol)
# Add a function redirection to $PSI_REDIRS.
psi_add_redir() {
- cat >>$PSI_REDIRS <<<" {\"$1\", (void(*)(void))$2}, "
+ cat >>$PSI_REDIRS <<EOF
+ {"$1", (psi_func_ptr) $2},
+EOF
}
# psi_add_decl(decl, options)
# Add a pre-defined decl to $PSI_VA_DECLS/$PSI_DECLS.
psi_add_decl() {
case "$2" in
+ *functor*)
+ cat >>$PSI_FN_DECLS <<EOF
+ $1, {0},
+EOF
+ ;;
*vararg*)
- cat >>$PSI_VA_DECLS <<<" $1, {0}, "
+ cat >>$PSI_VA_DECLS <<EOF
+ $1, {0},
+EOF
;;
*)
- cat >>$PSI_DECLS <<<" $1, {0}, "
+ cat >>$PSI_DECLS <<EOF
+ $1, {0},
+EOF
;;
esac
}
+dnl PSI_DECL_TYPE(type functor_name, args)
+dnl Adds a pre-defined functor decl to $PSI_FN_DECLS.
+AC_DEFUN(PSI_DECL_TYPE, [
+ PSI_DECL_ARGS($1, $2)
+ psi_add_decl "$psi_decl_args" functor
+])
dnl PSI_REDIR(name, custom symbol)
dnl Create a function redirection to an optional custom symbol.
AC_DEFUN(PSI_REDIR, [
dnl PSI_FUNC_LIBC_MAIN()
dnl Check for the platforms default stub in executables.
AC_DEFUN(PSI_FUNC_LIBC_MAIN, [
- AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_PROG_AWK])
AC_CACHE_CHECK(for libc start main symbol, psi_cv_libc_main, [
psi_libc_main=
AC_TRY_LINK(PSI_INCLUDES, [(void)0;], [
- psi_libc_main=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
+ psi_libc_main=`nm -g conftest$ac_exeext | $AWK -F ' *|@' '/^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
])
psi_cv_libc_main=$psi_libc_main
])
])
-dnl PSI_FUNC(fn, action-if-yes, action-if-no)
-dnl Check for a possible function redirection.
-AC_DEFUN(PSI_FUNC, [
- AC_REQUIRE([PSI_FUNC_LIBC_MAIN])
- psi_symbol=$1
- AC_CACHE_CHECK(for $1, psi_cv_fn_$1, [
- psi_symbol_redirect=
- AC_TRY_LINK(PSI_INCLUDES, [
- void (*fn)(void) = (void (*)(void)) $psi_symbol;
- ], [
- psi_symbol_redirect=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^@<:@@<:@:space:@:>@@:>@+U '$psi_cv_libc_main'/ {next} /^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
- ])
- psi_cv_fn_$1=$psi_symbol_redirect
- ])
- case "$psi_cv_fn_$1" in
- "")
- $3
- ;;
- "$psi_symbol"|"_$psi_symbol")
- $2
- ;;
- *)
- $2
- PSI_REDIR($1)
- ;;
- esac
+dnl PSI_DECL_ARGS(decl args)
+dnl INTERNAL: build psi_decl_args
+AC_DEFUN(PSI_DECL_ARGS, [
+ psi_decl_args=
+ PSI_DECL_ARG($1)
+ m4_case([$2],
+ [(void)], [],
+ [()], [],
+ [m4_map_args_sep([PSI_DECL_ARG(m4_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
])
dnl PSI_DECL_ARG(decl arg)
])
dnl PSI_DECL(type func, args, flags)
-dnl Check for a function or macro declaration.
+dnl Check for a function or macro declaration and a possible asm redirection.
dnl Adds a pre-defined (vararg) decl to $PSI_VA_DECLS/$PSI_DECLS.
dnl Calls PSI_MACRO if PSI_FUNC fails.
AC_DEFUN(PSI_DECL, [
- psi_decl_args=
- PSI_DECL_ARG($1)
- m4_case([$2],
- [(void)], [],
- [()], [],
- [m4_map_args_sep([PSI_DECL_ARG(m4_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
- PSI_FUNC(PSI_VAR_NAME($1), [
+ AC_REQUIRE([PSI_FUNC_LIBC_MAIN])
+ PSI_DECL_ARGS($1, $2)
+
+ psi_symbol="PSI_VAR_NAME($1)"
+ AC_CACHE_CHECK(for PSI_VAR_NAME($1), [psi_cv_fn_]PSI_VAR_NAME($1), [
+ psi_symbol_redirect=
+ AC_TRY_LINK(PSI_INCLUDES, [
+ void (*fn)(void) = (void (*)(void)) $psi_symbol; (*fn)()
+ ], [
+ psi_symbol_redirect=`nm -g conftest$ac_exeext | $AWK -F ' *|@' '/^@<:@@<:@:space:@:>@@:>@+U '$psi_cv_libc_main'/ {next} /^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
+ ])
+ [psi_cv_fn_]PSI_VAR_NAME($1)=$psi_symbol_redirect
+ ])
+ case "$[psi_cv_fn_]PSI_VAR_NAME($1)" in
+ "$psi_symbol"|"_$psi_symbol")
psi_add_decl "$psi_decl_args" $3
- ], [
- PSI_MACRO($1, $2, [
- ifelse([$3], vararg, [
- AC_MSG_ERROR(varargs macro support is not implemented)
- ],[
+ ;;
+ "")
+ ifelse([$3], vararg, [
+ AC_MSG_ERROR(varargs macro support is not implemented)
+ ],[
+ PSI_MACRO($1, $2, [
psi_add_decl "$psi_decl_args"
])
])
- ])
+ ;;
+ *)
+ PSI_REDIR($psi_symbol)
+ psi_add_decl "$psi_decl_args" $3
+ ;;
+ esac
])