diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/cpu/start16.S | 5 | ||||
| -rw-r--r-- | arch/i386/lib/board.c | 25 |
2 files changed, 25 insertions, 5 deletions
diff --git a/arch/i386/cpu/start16.S b/arch/i386/cpu/start16.S index 3e8b2cc..ebe5835 100644 --- a/arch/i386/cpu/start16.S +++ b/arch/i386/cpu/start16.S @@ -45,6 +45,7 @@ board_init16_ret: wbinvd /* load the temporary Global Descriptor Table */ +o32 cs lidt idt_ptr o32 cs lgdt gdt_ptr /* Now, we enter protected mode */ @@ -68,6 +69,10 @@ code32start: .long _start /* offset */ .word 0x10 /* segment */ +idt_ptr: + .word 0 /* limit */ + .long 0 /* base */ + /* * The following Global Descriptor Table is just enough to get us into * 'Flat Protected Mode' - It will be discarded as soon as the final diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c index 684cdb8..93f910b 100644 --- a/arch/i386/lib/board.c +++ b/arch/i386/lib/board.c @@ -431,15 +431,30 @@ void hang (void) for (;;); } -unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char * const argv[]) +unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[]) { + unsigned long ret = 0; + char **argv_tmp; + /* - * x86 does not use a dedicated register to pass the pointer - * to the global_data + * x86 does not use a dedicated register to pass the pointer to + * the global_data, so it is instead passed as argv[-1]. By using + * argv[-1], the called 'Application' can use the contents of + * argv natively. However, to safely use argv[-1] a new copy of + * argv is needed with the extra element */ - argv[-1] = (char *)gd; + argv_tmp = malloc(sizeof(char *) * (argc + 1)); + + if (argv_tmp) { + argv_tmp[0] = (char *)gd; + + memcpy(&argv_tmp[1], argv, (size_t)(sizeof(char *) * argc)); + + ret = (entry) (argc, &argv_tmp[1]); + free(argv_tmp); + } - return (entry) (argc, argv); + return ret; } void setup_pcat_compatibility(void) |