mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-25 00:29:23 +00:00
Fix variable name collision
This commit is contained in:
1 parent
d2601bb7bc
commit
b56495543a
3 files changed
+10
-11
No files matched your search
@@ -25,27 +25,26 @@ VARIABLE(grub_relocator_backward_start)
|
||||
/* mov imm32, %rax */
|
||||
.byte 0x48
|
||||
.byte 0xb8
|
||||
RELOCATOR_VARIABLE(dest)
|
||||
VARIABLE(grub_relocator_backward_dest)
|
||||
.long 0, 0
|
||||
movq %rax, %rdi
|
||||
|
||||
/* mov imm64, %rax */
|
||||
.byte 0x48
|
||||
.byte 0xb8
|
||||
RELOCATOR_VARIABLE(src)
|
||||
VARIABLE(grub_relocator_backward_src)
|
||||
.long 0, 0
|
||||
movq %rax, %rsi
|
||||
|
||||
/* mov imm32, %ecx */
|
||||
.byte 0x48
|
||||
.byte 0xb9
|
||||
RELOCATOR_VARIABLE(size)
|
||||
VARIABLE(grub_relocator_backward_chunk_size)
|
||||
.long 0, 0
|
||||
|
||||
add %rcx, %rsi
|
||||
add %rcx, %rdi
|
||||
|
||||
|
||||
/* Backward movsb is implicitly off-by-one. compensate that. */
|
||||
sub $1, %rsi
|
||||
sub $1, %rdi
|
||||
@@ -77,7 +76,7 @@ VARIABLE(grub_relocator_forward_src)
|
||||
/* mov imm64, %rcx */
|
||||
.byte 0x48
|
||||
.byte 0xb9
|
||||
VARIABLE(grub_relocator_forward_size)
|
||||
VARIABLE(grub_relocator_forward_chunk_size)
|
||||
.long 0, 0
|
||||
|
||||
/* Forward copy. */
|
||||
|
||||
Reference in new issue
Block a user