vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

support relocator64 from x86_64 mode

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-13 23:17:12 +01:00
parent 0c31c22bda
commit 6d8ebf76c4
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/i386/relocator64.S
View file

@ -43,13 +43,13 @@ LOCAL(base):
add $(LOCAL(cont0) - LOCAL(base)), RAX add $(LOCAL(cont0) - LOCAL(base)), RAX
jmp *RAX jmp *RAX
LOCAL(cont0): LOCAL(cont0):
#ifndef __x86_64__
lea (LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX lea (LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
mov RAX, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1) mov RAX, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
lea (LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX lea (LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
mov RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1) mov RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
#ifndef __x86_64__
/* Disable paging. */ /* Disable paging. */
movl %cr0, %eax movl %cr0, %eax
andl $(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax andl $(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
@ -76,6 +76,12 @@ VARIABLE(grub_relocator64_cr3)
movl %cr0, %eax movl %cr0, %eax
orl $GRUB_MEMORY_CPU_CR0_PAGING_ON, %eax orl $GRUB_MEMORY_CPU_CR0_PAGING_ON, %eax
movl %eax, %cr0 movl %eax, %cr0
/* Load GDT. */
lgdt (LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
/* Update %cs. */
ljmp *(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
#else #else
/* mov imm64, %rax */ /* mov imm64, %rax */
.byte 0x48 .byte 0x48
@ -84,11 +90,6 @@ VARIABLE(grub_relocator64_cr3)
.quad 0 .quad 0
movq %rax, %cr3 movq %rax, %cr3
#endif #endif
/* Load GDT. */
lgdt (LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
/* Update %cs. */
ljmp *(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
LOCAL(cont1): LOCAL(cont1):
.code64 .code64
@ -143,6 +144,7 @@ LOCAL(jump_addr):
VARIABLE(grub_relocator64_rip) VARIABLE(grub_relocator64_rip)
.quad 0 .quad 0
#ifndef __x86_64__
.p2align 4 .p2align 4
LOCAL(gdt): LOCAL(gdt):
/* NULL. */ /* NULL. */
@ -185,22 +187,14 @@ LOCAL(gdt):
LOCAL(gdtdesc): LOCAL(gdtdesc):
.word 0x20 .word 0x20
LOCAL(gdt_addr): LOCAL(gdt_addr):
#ifdef __x86_64__
/* Filled by the code. */
.quad 0
#else
/* Filled by the code. */ /* Filled by the code. */
.long 0 .long 0
#endif
.p2align 4 .p2align 4
LOCAL(jump_vector): LOCAL(jump_vector):
/* Jump location. Is filled by the code */ /* Jump location. Is filled by the code */
#ifdef __x86_64__
.quad 0
#else
.long 0 .long 0
#endif
.long CODE64_SEGMENT .long CODE64_SEGMENT
#endif
VARIABLE(grub_relocator64_end) VARIABLE(grub_relocator64_end)