david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

PM function called by prot_call() should be allowed to modifying 

registers returned to RM code.
This commit is contained in:
Michael Brown 2005-04-09 13:56:33 +00:00
parent 29f43896aa
commit a800e9657d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/arch/i386/transitions/librm.S
View File

@ -496,8 +496,10 @@ EXPORT(prot_call):
movl $SIZEOF_REAL_MODE_REGS, %ecx
subl %ecx, %esp
movl %esp, %edi
pushl %esi
cld
rep movsb
rep movsb
popl %edi /* %edi = phys addr of RM copy of rm_regs */
/* Switch to virtual addresses. */
call 1f
@ -522,7 +524,18 @@ EXPORT(prot_call):
/* Switch to physical addresses, discard PM register store */
lcall $VIRTUAL_CS, $_virt_to_phys
addl $SIZEOF_REAL_MODE_REGS+4, %esp /* also discard lcall seg */
popl %eax /* discard */
/* Copy rm_regs from PM stack to RM stack, and remove rm_regs
* from PM stack. (%edi still contains physical address of
* rm_regs on RM stack from earlier, since C code preserves
* %edi).
*/
movl %esp, %esi
movl $SIZEOF_REAL_MODE_REGS, %ecx
cld
rep movsb
movl %esi, %esp /* remove rm_regs from PM stack */
/* Switch to real mode */
call prot_to_real