Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4 from sakuranakamoto/master

Browse Source 
Made error messages more specific
This commit is contained in:
mint 2019-07-08 23:27:28 +02:00 committed by GitHub
commit 991487c25a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bootsect/bootsect.asm
View File

@ -28,15 +28,20 @@ mov ebx, 0x7e00
mov cx, 1
call read_sectors
jc err
jc err_reading_disk
mov si, DoneMsg
call simple_print
jmp 0x7e00
err:
mov si, ErrMsg
err_reading_disk:
mov si, ErrReadDiskMsg
call simple_print
jmp halt
err_enabling_a20:
mov si, ErrEnableA20Msg
call simple_print
halt:
@ -47,7 +52,8 @@ jmp halt
LoadingMsg db 0x0D, 0x0A, '<qLoader 2>', 0x0D, 0x0A, 0x0A, 0x00
Stage2Msg db 'stage1: Loading stage2...', 0x00
ErrMsg db 0x0D, 0x0A, 'Error, system halted.', 0x00
ErrReadDiskMsg db 0x0D, 0x0A, 'Error reading disk, system halted.', 0x00
ErrEnableA20Msg db 0x0D, 0x0A, 'Error enabling a20, system halted.', 0x00
DoneMsg db ' DONE', 0x0D, 0x0A, 0x00
times 0xda-($-$$) db 0
@ -70,13 +76,12 @@ mov ax, 2
mov ebx, 0x8000
mov cx, 14
call read_sectors
jc err
jc err_reading_disk
; Enable A20
call enable_a20
jc err
jc err_enabling_a20
; Enter 32 bit pmode