public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] untyped calls: enable target switching [PR112334] Date: Fri, 1 Dec 2023 23:42:36 +0000 (GMT) [thread overview] Message-ID: <20231201234236.08CAB385700F@sourceware.org> (raw) https://gcc.gnu.org/g:98f8c203797ee77ad99d7dc4a3ac69a9cbad03af commit 98f8c203797ee77ad99d7dc4a3ac69a9cbad03af Author: Alexandre Oliva <oliva@adacore.com> Date: Fri Dec 1 09:44:07 2023 -0300 untyped calls: enable target switching [PR112334] The computation of apply_args_size and apply_result_size is saved in a static variable, so that the corresponding _mode arrays are initialized only once. That is not compatible with switchable targets, and ARM's arm_set_current_function, by saving and restoring target globals, exercises this problem with a testcase such as that in the PR, in which more than one function in the translation unit calls __builtin_apply or __builtin_return, respectively. This patch moves the _size statics into the target_builtins array, with a bit of ugliness over _plus_one so that zero initialization of the struct does the right thing. for gcc/ChangeLog PR target/112334 * builtins.h (target_builtins): Add fields for apply_args_size and apply_result_size. * builtins.cc (apply_args_size, apply_result_size): Cache results in fields rather than in static variables. (get_apply_args_size, set_apply_args_size): New. (get_apply_result_size, set_apply_result_size): New. Diff: --- gcc/builtins.cc | 16 ++++++++++++++-- gcc/builtins.h | 7 +++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gcc/builtins.cc b/gcc/builtins.cc index 4fc58a0bda9..039bb5e997a 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -1398,8 +1398,16 @@ get_memory_rtx (tree exp, tree len) \f /* Built-in functions to perform an untyped call and return. */ +#define set_apply_args_size(x) \ + (this_target_builtins->x_apply_args_size_plus_one = 1 + (x)) +#define get_apply_args_size() \ + (this_target_builtins->x_apply_args_size_plus_one - 1) #define apply_args_mode \ (this_target_builtins->x_apply_args_mode) +#define set_apply_result_size(x) \ + (this_target_builtins->x_apply_result_size_plus_one = 1 + (x)) +#define get_apply_result_size() \ + (this_target_builtins->x_apply_result_size_plus_one - 1) #define apply_result_mode \ (this_target_builtins->x_apply_result_mode) @@ -1409,7 +1417,7 @@ get_memory_rtx (tree exp, tree len) static int apply_args_size (void) { - static int size = -1; + int size = get_apply_args_size (); int align; unsigned int regno; @@ -1442,6 +1450,8 @@ apply_args_size (void) } else apply_args_mode[regno] = as_a <fixed_size_mode> (VOIDmode); + + set_apply_args_size (size); } return size; } @@ -1452,7 +1462,7 @@ apply_args_size (void) static int apply_result_size (void) { - static int size = -1; + int size = get_apply_result_size (); int align, regno; /* The values computed by this function never change. */ @@ -1484,6 +1494,8 @@ apply_result_size (void) #ifdef APPLY_RESULT_SIZE size = APPLY_RESULT_SIZE; #endif + + set_apply_result_size (size); } return size; } diff --git a/gcc/builtins.h b/gcc/builtins.h index 88a26d70cd5..1a26fc63a6d 100644 --- a/gcc/builtins.h +++ b/gcc/builtins.h @@ -37,6 +37,13 @@ struct target_builtins { register windows, this gives only the outbound registers. INCOMING_REGNO gives the corresponding inbound register. */ fixed_size_mode_pod x_apply_result_mode[FIRST_PSEUDO_REGISTER]; + + /* Nonzero iff the arrays above have been initialized. The _plus_one suffix + is for zero initialization to make it an unreasonable size, used to signal + that the size and the corresponding mode array has not been + initialized. */ + int x_apply_args_size_plus_one; + int x_apply_result_size_plus_one; }; extern struct target_builtins default_target_builtins;
next reply other threads:[~2023-12-01 23:42 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-12-01 23:42 Alexandre Oliva [this message] -- strict thread matches above, loose matches on Subject: below -- 2023-12-12 2:38 Alexandre Oliva 2023-12-06 22:47 Alexandre Oliva 2023-12-06 20:01 Alexandre Oliva 2023-12-06 2:31 Alexandre Oliva 2023-12-05 21:51 Alexandre Oliva 2023-12-05 19:30 Alexandre Oliva 2023-12-03 1:46 Alexandre Oliva 2023-12-02 17:48 Alexandre Oliva 2023-12-01 18:04 Alexandre Oliva 2023-12-01 13:35 Alexandre Oliva
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231201234236.08CAB385700F@sourceware.org \ --to=aoliva@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).