[ros-diffs] [tkreuzer] 48136: [FREELDR] - Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest - Disable debugging in isoboot.asm

Author: tkreuzer
Date: Tue Jul 20 15:45:53 2010
New Revision: 48136

URL: http://svn.reactos.org/svn/reactos?rev=48136&view=rev
Log:
[FREELDR]
- Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest
- Disable debugging in isoboot.asm

Modified:
    trunk/reactos/boot/freeldr/bootsect/isoboot.asm
    trunk/reactos/boot/freeldr/bootsect/isobtrt.asm

Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Tue Jul 20 15:45:53 2010
@@ -31,7 +31,7 @@
 ; ****************************************************************************
 
 ; Note: The Makefile builds one version with DEBUG_MESSAGES automatically.
-%define DEBUG_MESSAGES                ; Uncomment to get debugging messages
+;%define DEBUG_MESSAGES                ; Uncomment to get debugging messages
 
 %define WAIT_FOR_KEY
 
@@ -373,20 +373,13 @@
 
 	mov	dl, [DriveNo]			; dl = boot drive
 	mov dh, 0					; dh = boot partition
-
 	push 0						; push segment (0x0000)
 	mov eax, [0x8000 + 0xA8]	; load the RVA of the EntryPoint into eax
-	add eax, 0x8000             ; RVA -> VA
-	push ax                     ; push offset
-	retf                        ; Transfer control to ROSLDR
-
-	mov eax, [0x8000 + 0xA8]	; load the EntryPoint into eax
-	add eax, 0x8000
-	mov [jmpaddress], eax
-
-
-	db 0xea						; jmp instruction
-	jmpaddress dd 0
+	add eax, 0x8000				; RVA -> VA
+	push ax						; push offset
+	retf						; Transfer control to ROSLDR
+
+
 
 ;
 ; searchdir:

Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Tue Jul 20 15:45:53 2010
@@ -345,7 +345,11 @@
 
 	mov	dl, [DriveNo]			; dl = boot drive
 	mov dh, 0					; dh = boot partition
-	jmp	0:0x8000			; jump into OSLoader
+	push 0						; push segment (0x0000)
+	mov eax, [0x8000 + 0xA8]	; load the RVA of the EntryPoint into eax
+	add eax, 0x8000				; RVA -> VA
+	push ax						; push offset
+	retf						; Transfer control to ROSLDR