configure: generate less files, and do that in build dir

[m6w6/ext-psi] / m4 / psi / psi_macro.m4

diff --git a/m4/psi/psi_macro.m4 b/m4/psi/psi_macro.m4
index b3ee9882ebb7d8fda758b79a2b1cee9e69d98ccc..d156389cc74d8d36dd735f6c4344e361295f8f1c 100644 (file)
--- a/m4/psi/psi_macro.m4
+++ b/m4/psi/psi_macro.m4
@@ -1,33 +1,43 @@
 # psi_add_macro(macro)
-# Add a pre-defined macro function to $PSI_MACROS.
+# Add a pre-defined macro function to $PSI_MACROS_H.
 psi_add_macro() {
-       cat >>$PSI_MACROS <<EOF
-$1
-EOF
+       PSI_MACROS="$PSI_MACROS
+$1"
 }
 
 dnl PSI_MACRO(macro, decl args, action-if-true)
 AC_DEFUN(PSI_MACRO, [
        AC_CHECK_DECL(PSI_VAR_NAME($1)$2, [
-               $3
                macro_type="PSI_VAR_TYPE($1)"
                macro_name="PSI_VAR_NAME($1)"
+               PSI_TYPE_INDIRECTION([$1],, macro_pointer_level, macro_array_size)
+               if test "$macro_array_size" -gt 0; then
+                       macro_array="@<:@$macro_array_size@:>@"
+                       macro_return="$macro_type*"
+               else
+                       macro_array=""
+                       macro_return="$macro_type"
+               fi
                m4_case([$2],
                        [(void)], [
                                macro_decl="(void)"
                                macro_call="()"
+                               macro_action=call
                        ],
                        [()], [
                                macro_decl="()"
                                macro_call="()"
+                               macro_action=call
                        ],
                        [], [
                                macro_decl="()"
                                macro_call=""
+                               macro_action=get
                        ],
                        [
                                macro_decl="$2"
                                macro_call="(m4_map_args_sep([PSI_VAR_NAME(], [)], [, ], m4_bregexp($2, [(\(.*\))], [\1])))"
+                               macro_action=call
                        ]
                )
                ifelse(PSI_VAR_TYPE($1), [void], [
@@ -35,10 +45,26 @@ AC_DEFUN(PSI_MACRO, [
                ], [
                        macro_body="return $macro_name$macro_call;"
                ])
-               psi_add_macro "$macro_type _psi_redir_$macro_name$macro_decl { $macro_body }"
-               PSI_REDIR($macro_name, _psi_redir_$macro_name)
-       ], [], PSI_INCLUDES)
+               $3
+               psi_add_macro "$macro_return _psi_${macro_action}_$macro_name$macro_decl { $macro_body }"
+               PSI_REDIR($macro_name, _psi_${macro_action}_$macro_name)
+       ], [], [PSI_INCLUDES])
 ])
 
 dnl PSI_EXTVAR(type var)
-AC_DEFUN(PSI_EXTVAR, [PSI_MACRO($1)])
+AC_DEFUN(PSI_EXTVAR, [
+       PSI_MACRO($1, [], [
+               dnl just a getter
+               PSI_DECL_ARGS($1)
+               psi_add_decl "$psi_decl_args"
+               dnl explicit getter
+               PSI_REDIR([${macro_name}_get], [_psi_get_$macro_name])
+               PSI_DECL_ARGS(PSI_VAR_TYPE_RETURN([$1]) PSI_VAR_NAME([$1])_get)
+               psi_add_decl "$psi_decl_args"
+               dnl setter
+               psi_add_macro "void _psi_set_${macro_name}($macro_type value$macro_array) { memcpy(&$macro_name, &value, sizeof($macro_type$macro_array)); }"
+               PSI_REDIR([${macro_name}_set], [_psi_set_${macro_name}])
+               PSI_DECL_ARGS([void ]PSI_VAR_NAME([$1])[_set], [($1)])
+               psi_add_decl "$psi_decl_args"
+       ])
+])