Skip to content

tools/mksyscall: fix union illegal type for cast #18360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zyfeier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tools/mksyscall: fix union illegal type for cast #18360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion tools/mksyscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@ static void generate_stub(int nfixed, int nparms)
g_parm[0]);
fprintf(stream, "#include <nuttx/config.h>\n");
fprintf(stream, "#include <stdint.h>\n");
fprintf(stream, "#ifdef CONFIG_ARCH_TOOLCHAIN_TASKING\n");
fprintf(stream, "#include <string.h>\n");
fprintf(stream, "#endif\n");

if (strlen(g_parm[HEADER_INDEX]) > 0)
{
Expand Down Expand Up @@ -461,6 +464,28 @@ static void generate_stub(int nfixed, int nparms)

fprintf(stream, ")\n{\n");

/* Fixed union illegal type for cast */

for (i = 0; i < nparms; i++)
{
get_formalparmtype(g_parm[PARM1_INDEX + i], formal);
get_actualparmtype(g_parm[PARM1_INDEX + i], actual);

if (is_union(formal))
{
fprintf(stream, " %s _parm%d;\n", formal, i + 1);
fprintf(stream, "#ifdef CONFIG_ARCH_TOOLCHAIN_TASKING\n");
fprintf(stream, " memcpy((FAR void *)&_parm%d, "
"(FAR void *)&parm%d,\n"
" sizeof(uintptr_t));\n",
i + 1, i + 1);
fprintf(stream, "#else\n");
fprintf(stream, " _parm%d = (%s)((%s)parm%d);\n",
i + 1, formal, actual, i + 1);
fprintf(stream, "#endif\n");
}
}

/* Then call the proxied function. Functions that have no return value are
* a special case.
*/
Expand Down Expand Up @@ -503,7 +528,7 @@ static void generate_stub(int nfixed, int nparms)

if (is_union(formal))
{
fprintf(stream, "(%s)((%s)parm%d)", formal, actual, i + 1);
fprintf(stream, "_parm%d", i + 1);
}
else
{
Expand Down
Loading