diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-10-24 16:03:23 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-10-24 16:03:23 +0200 |
| commit | 03cb792d510a067d4ffead2c8088ee953d70c2cb (patch) | |
| tree | cdd53f342c8679e3d1ebdf8dd19534c9157b6ce5 /boot/stage2.asm | |
| parent | 610cfb4cee7ca3f35f642eeb06de2c710ab67754 (diff) | |
Minor changes/fixes in bootloader
Diffstat (limited to 'boot/stage2.asm')
| -rw-r--r-- | boot/stage2.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/boot/stage2.asm b/boot/stage2.asm index 9dd00bc..9a1c74c 100644 --- a/boot/stage2.asm +++ b/boot/stage2.asm @@ -39,7 +39,7 @@ ; MEMMAP_SIZE_OFFSET equ 0x7c00 MEMMAP_OFFSET equ 0x7c01 -VESA_MODES equ 0x8300 +VESA_MODES equ 0x8300 ; do NOT overwrite yourself! be careful! VESA_MODE_INFO equ 0x8400 VESA_MODE_SELECT equ 0x4114 ; @@ -174,12 +174,12 @@ boot_32_pm: je finish_load ; show KERNEL CHUNK value - push edx ; persist edx for some reason!? - mov edx,0 - mov dx,[KERNEL_CHUNK] - mov ecx,2*24*80 - call print_hex_pm - pop edx +; push edx ; persist edx for some reason!? +; mov edx,0 +; mov dx,[KERNEL_CHUNK] +; mov ecx,2*24*80 +; call print_hex_pm +; pop edx ; here we actually do copy the chunk into ext mem! @@ -205,11 +205,10 @@ boot_32_pm: finish_load: ; - ; call kernel! mov eax,0 ;tell the kernel ; we are the booting processor - call 0x100000 ;jump into our Kernel! + jmp 0x100000 ;jump into our Kernel! [bits 16] |