First compileable newreloc

lib/i386/relocator_asm.S

@@ -19,230 +19,60 @@
 #include <grub/symbol.h>
 #include <grub/i386/memory.h>
 
-#ifdef BACKWARD
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
-#else
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
-#endif
-#ifdef __x86_64__
-#define RAX %rax
-#define RCX %rcx
-#define RDI %rdi
-#define RSI %rdi
-#else
-#define RAX %eax
-#define RCX %ecx
-#define RDI %edi
-#define RSI %esi
-#endif
-
-/* The code segment of the protected mode.  */
-#define CODE_SEGMENT	0x10
-
-/* The data segment of the protected mode.  */
-#define DATA_SEGMENT	0x18
-
-	.p2align	4	/* force 16-byte alignment */
-
-RELOCATOR_VARIABLE(start)
-#ifdef BACKWARD
-LOCAL(base):
-#endif
-	cli
-
-#ifndef __x86_64__
+VARIABLE(grub_relocator_backward_start)
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE(dest)
+VARIABLE(grub_relocator_backward_dest)
 	.long	0
 	movl	%eax, %edi
 
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE(src)
+VARIABLE(grub_relocator_backward_src)
 	.long	0
 	movl	%eax, %esi
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-RELOCATOR_VARIABLE(size)
+VARIABLE(grub_relocator_backward_size)
 	.long	0
-#else
-	xorq	%rax, %rax
-
-	/* mov imm32, %eax */
-	.byte	0xb8
-RELOCATOR_VARIABLE(dest)
-	.long	0
-	movq	%rax, %rdi
-
-	/* mov imm64, %rax */
-	.byte	0x48
-	.byte	0xb8
-RELOCATOR_VARIABLE(src)
-	.long	0, 0
-	movq	%rax, %rsi
-
-	xorq	%rcx, %rcx
-	/* mov imm32, %ecx */
-	.byte	0xb9
-RELOCATOR_VARIABLE(size)
-	.long	0
-
-#endif
-
-	mov	RDI, RAX
-
-#ifdef BACKWARD
-	add	RCX, RSI
-	add	RCX, RDI
-#endif
-
-#ifndef BACKWARD
-	add	RCX, RAX
-#endif
-	add	$0x3, RCX
-	shr	$2, RCX
+	
+	add	%ecx, %esi
+	add	%ecx, %edi
 
 
-#ifdef BACKWARD
-	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	sub	$4,	RSI
-	sub	$4,	RDI
+	/* Backward movsb is implicitly off-by-one.  compensate that.  */
+	sub	$1,	%esi
+	sub	$1,	%edi
 
 	/* Backward copy.  */
 	std
 
 	rep
-	movsl
+	movsb
+VARIABLE(grub_relocator_backward_end)
 
-#else
-	/* Forward copy.  */
-	cld
-	rep
-	movsl
-#endif
-
-	/* %rax contains now our new 'base'.  */
-	mov	RAX, RSI
-	add	$(LOCAL(cont0) - LOCAL(base)), RAX
-	jmp	*RAX
-LOCAL(cont0):
-	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
-	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
-
-	/* Switch to compatibility mode. */
-
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-LOCAL(cont1):
-	.code32
-
-	/* Update other registers. */
-	movl	$DATA_SEGMENT, %eax
-	movl	%eax, %ds
-	movl	%eax, %es
-	movl	%eax, %fs
-	movl	%eax, %gs
-	movl	%eax, %ss
-
-	/* Disable paging. */
-	movl	%cr0, %eax
-	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
-	movl	%eax, %cr0
-
-	/* Disable amd64. */
-	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
-	rdmsr
-	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
-	wrmsr
-
-	/* Turn off PAE. */
-	movl	%cr4, %eax
-	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
-	movl	%eax, %cr4
-
-	jmp	LOCAL(cont2)
-LOCAL(cont2):
-	.code32
 
+VARIABLE(grub_relocator_forward_start)
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE (esp)
+VARIABLE(grub_relocator_forward_dest)
 	.long	0
+	movl	%eax, %edi
 
-	movl	%eax, %esp
-
-	/* mov imm32, %eax */
+	/* mov imm32, %rax */
 	.byte	0xb8
-RELOCATOR_VARIABLE (eax)
-	.long	0
-
-	/* mov imm32, %ebx */
-	.byte	0xbb
-RELOCATOR_VARIABLE (ebx)
+VARIABLE(grub_relocator_forward_src)
 	.long	0
+	movl	%eax, %esi
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-RELOCATOR_VARIABLE (ecx)
+VARIABLE(grub_relocator_forward_size)
 	.long	0
 
-	/* mov imm32, %edx */
-	.byte	0xba
-RELOCATOR_VARIABLE (edx)
-	.long	0
-
-	/* Cleared direction flag is of no problem with any current
-	   payload and makes this implementation easier.  */
+	/* Forward copy.  */
 	cld
-
-	.byte	0xea
-RELOCATOR_VARIABLE (eip)
-	.long	0
-	.word	CODE_SEGMENT
-
-	/* GDT. Copied from loader/i386/linux.c. */
-	.p2align	4
-LOCAL(gdt):
-	/* NULL.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Reserved.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Code segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
-
-	/* Data segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-
-	.p2align	4
-LOCAL(gdtdesc):
-	.word	0x27
-LOCAL(gdt_addr):
-#ifdef __x86_64__
-	/* Filled by the code. */
-	.quad	0
-#else
-	/* Filled by the code. */
-	.long	0
-#endif
-
-	.p2align	4
-LOCAL(jump_vector):
-	/* Jump location. Is filled by the code */
-	.long	0
-	.long	CODE_SEGMENT
-
-#ifndef BACKWARD
-LOCAL(base):
-#endif
-
-RELOCATOR_VARIABLE(end)
+	rep
+	movsb
+VARIABLE(grub_relocator_forward_end)