Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Fix the placing of Forth arguments on the stack when calling obp_fortheval_v2() via romvec on SPARC32.

Browse Source 
The extra stack arguments are actually placed within %o1-%o5 but unfortunately there doesn't seem to be a way of passing the 
number of parameters using the romvec API. Hence we go through the argument list and start pushing arguments onto the Forth 
stack from the first non-zero argument before executing the Forth string.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@915 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Mark Cave-Ayland
2010-10-18 19:32:16 +00:00
committed by Mark Cave-Ayland
parent dd6027703d
commit 3dbab02fc2
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc32/openprom.h
View File

@@ -124,7 +124,7 @@ struct linux_romvec {
/* Evaluate a forth string, not different proto for V0 and V2->up. */ /* Evaluate a forth string, not different proto for V0 and V2->up. */
union { union {
void (*v0_eval)(int len, char *str); void (*v0_eval)(int len, char *str);
void (*v2_eval)(char *str); void (*v2_eval)(char *str, int arg0, int arg1, int arg2, int arg3, int arg4);
} pv_fortheval; } pv_fortheval;
const struct linux_arguments_v0 * const *pv_v0bootargs; const struct linux_arguments_v0 * const *pv_v0bootargs;

40
arch/sparc32/romvec.c
View File

@@ -412,15 +412,39 @@ static int obp_cpuresume(__attribute__((unused)) unsigned int whichcpu)
return 0; return 0;
} }
static void obp_fortheval_v2(char *str) static void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4)
{ {
// for now, move something to the stack so we int pusharg = 0;
// don't get a stack underrun.
// // It seems Solaris passes up to 5 arguments which should be pushed onto the Forth
// FIXME: find out why solaris doesnt put its stuff on the stack // stack for execution. However the API doesn't provide for a way to pass the number
// // of arguments actually passed. Hence we start at arg4 and then starting from the
fword("0"); // first non-zero argument, we push all subsequent arguments onto the stack down to
fword("0"); // arg0.
if (arg4) {
PUSH(arg4);
pusharg = 1;
}
if (arg3 || pusharg == 1 ) {
PUSH(arg3);
pusharg = 1;
}
if (arg2 || pusharg == 1) {
PUSH(arg2);
pusharg = 1;
}
if (arg1 || pusharg == 1 ) {
PUSH(arg1);
pusharg = 1;
}
if (arg0 || pusharg == 1) {
PUSH(arg0);
}
DPRINTF("obp_fortheval_v2(%s)\n", str); DPRINTF("obp_fortheval_v2(%s)\n", str);
push_str(str); push_str(str);