Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
- Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest
- Disable debugging in isoboot.asm

svn path=/trunk/; revision=48136
This commit is contained in:
Timo Kreuzer 2010-07-20 15:45:53 +00:00
parent bc9f1e46f1
commit 96353a5721
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/boot/freeldr/bootsect/isoboot.asm
View file

@ -31,7 +31,7 @@
; **************************************************************************** ; ****************************************************************************
; Note: The Makefile builds one version with DEBUG_MESSAGES automatically. ; 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 %define WAIT_FOR_KEY
@ -373,20 +373,13 @@ get_fs_structures:
mov dl, [DriveNo] ; dl = boot drive mov dl, [DriveNo] ; dl = boot drive
mov dh, 0 ; dh = boot partition mov dh, 0 ; dh = boot partition
push 0 ; push segment (0x0000) push 0 ; push segment (0x0000)
mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax
add eax, 0x8000 ; RVA -> VA add eax, 0x8000 ; RVA -> VA
push ax ; push offset push ax ; push offset
retf ; Transfer control to ROSLDR 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
; ;
; searchdir: ; searchdir:

6
reactos/boot/freeldr/bootsect/isobtrt.asm
View file

@ -345,7 +345,11 @@ get_fs_structures:
mov dl, [DriveNo] ; dl = boot drive mov dl, [DriveNo] ; dl = boot drive
mov dh, 0 ; dh = boot partition 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