Skip to content

Commit bc1e15e

Browse files
committed
[FREELDR] Adapt multiboot code for the position independent code (reactos#7530)
CORE-19882
1 parent ca7b1c0 commit bc1e15e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

boot/freeldr/freeldr/arch/i386/multiboot.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
44
* PURPOSE: Support for the Multiboot v1 specification.
55
* COPYRIGHT: Copyright 1998-2002 Brian Palmer <[email protected]>
6-
* Copyright 2024 Daniel Victor <[email protected]>
6+
* Copyright 2024-2025 Daniel Victor <[email protected]>
77
*/
88

99
#include <asm.inc>
@@ -33,7 +33,7 @@
3333
* multiboot kernels above 1MB. So we let GRUB load us
3434
* there and then relocate ourself to FREELDR_BASE.
3535
*/
36-
#define INITIAL_BASE HEX(200000)
36+
#define INITIAL_BASE TEMPCODE_BASE
3737

3838

3939
#ifdef _M_IX86
@@ -190,7 +190,7 @@ mb4:
190190
mov cr0, rax
191191

192192
/* Jump to real entry point */
193-
ljmp16 0, FREELDR_BASE
193+
ljmp16 FREELDR_BASE / 16, 0
194194

195195

196196
/* Force 8-byte alignment */

0 commit comments

Comments
 (0)