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

64-bit bugfixes

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-08-03 13:45:37 +02:00
parent e7573c5ce2
commit c2a583ec38
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/i386/relocator_asm.S
View file

@ -89,12 +89,13 @@ RELOCATOR_VARIABLE(dest)
mov %eax, %edi mov %eax, %edi
/* mov imm64, %rax */ /* mov imm64, %rax */
.byte 0x48
.byte 0xb8 .byte 0xb8
RELOCATOR_VARIABLE(src) RELOCATOR_VARIABLE(src)
.long 0, 0 .long 0, 0
mov %rax, %rsi mov %rax, %rsi
xorl %rcx, %rcx xorq %rcx, %rcx
/* mov imm32, %ecx */ /* mov imm32, %ecx */
.byte 0xb9 .byte 0xb9
RELOCATOR_VARIABLE(size) RELOCATOR_VARIABLE(size)
@ -109,13 +110,13 @@ RELOCATOR_VARIABLE(size)
#ifdef BACKWARD #ifdef BACKWARD
/* Backward movsl is implicitly off-by-four. compensate that. */ /* Backward movsl is implicitly off-by-four. compensate that. */
subl $4, %rsi subq $4, %rsi
subl $4, %rdi subq $4, %rdi
/* Backward copy. */ /* Backward copy. */
std std
addl %rcx, %rsi addq %rcx, %rsi
addl %rcx, %rdi addq %rcx, %rdi
rep rep
movsl movsl
@ -230,7 +231,11 @@ RELOCATOR_VARIABLE (edx)
.byte 0xea .byte 0xea
RELOCATOR_VARIABLE (eip) RELOCATOR_VARIABLE (eip)
.long 0 .long 0
#ifdef __x86_64__
.word 0x10
#else
.word 0x08 .word 0x08
#endif
#ifdef __x86_64__ #ifdef __x86_64__
/* GDT. Copied from loader/i386/linux.c. */ /* GDT. Copied from loader/i386/linux.c. */