sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: Remove do_execute and thumb2_execute 

In commit 104a6a7ccf support was added
for Thumb2.  It added do_execute() as a way to provide arch dependent
calling veneers for use in "go" and thumb2_execute() as the thumb2 to
arm veneer.

But thumb2_execute() isn't necessary as gcc generates a proper calling
sequence from a standard function pointer call.  Thumb2 barebox is
compiled with the AAPCS ABI which requires this.

It also had a bug and didn't pass the arguments properly, but code
execute via "go" rarely uses arguments so this wasn't very noticeable.

Since thumb2 was always the only user of do_execute(), go ahead and
delete that too.

Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Trent Piepho 2015-12-04 19:24:19 +00:00 committed by Sascha Hauer
parent de7a09bb43
commit a2b3a25417
4 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm/cpu/cpu.c
View File

@ -121,29 +121,3 @@ static int arm_request_stack(void)
return 0;
}
coredevice_initcall(arm_request_stack);
#ifdef CONFIG_THUMB2_BAREBOX
static void thumb2_execute(void *func, int argc, char *argv[])
{
/*
* Switch back to ARM mode before executing external
* programs.
*/
__asm__ __volatile__ (
"mov r0, #0\n"
"mov r1, %0\n"
"mov r2, %1\n"
"bx %2\n"
:
: "r" (argc - 1), "r" (&argv[1]), "r" (func)
: "r0", "r1", "r2"
);
}
static int execute_init(void)
{
do_execute = thumb2_execute;
return 0;
}
postcore_initcall(execute_init);
#endif

5
commands/go.c
View File

@ -60,10 +60,7 @@ static int do_go(int argc, char *argv[])
shutdown_barebox();
if (do_execute)
do_execute(func, argc - 1, &argv[1]);
else
func(argc - 1, &argv[1]);
func(argc - 1, &argv[1]);
/*
* The application returned. Since we have shutdown barebox and

3
common/misc.c
View File

@ -130,9 +130,6 @@ void perror(const char *s)
}
EXPORT_SYMBOL(perror);
void (*do_execute)(void *func, int argc, char *argv[]);
EXPORT_SYMBOL(do_execute);
static char *model;
/*

6
include/common.h
View File

@ -113,12 +113,6 @@ extern int (*barebox_main)(void);
void __noreturn start_barebox(void);
void shutdown_barebox(void);
/*
* architectures which have special calling conventions for
* executing programs should set this. Used by the 'go' command
*/
extern void (*do_execute)(void *func, int argc, char *argv[]);
int run_shell(void);
#ifdef CONFIG_SHELL_HUSH