Skip to content

New verify method #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IanSeyler merged 1 commit into from
May 23, 2018
Merged

New verify method #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/arch/x86_64/bootsectors/mbr.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ check_A20:
jc read_fail

; Verify that the 2nd stage boot loader was read.
mov eax, [0x8000]
cmp eax, 0x00017EE9 ; Match against the Pure64 binary
mov ax, [0x8006]
cmp ax, 0x3436 ; Match against the Pure64 binary
jne magic_fail

; Read the 3rd stage boot loader into memory.
Expand Down
4 changes: 2 additions & 2 deletions src/arch/x86_64/bootsectors/pxestart.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ check_A20:
cmp ax, 0x004F ; Return value in AX should equal 0x004F if supported and successful
jne halt

mov eax, [0x8000]
cmp eax, 0x00017EE9 ; Match against the Pure64 binary
mov ax, [0x8006]
cmp ax, 0x3436 ; Match against the Pure64 binary
jne magic_fail

; At this point we are done with real mode and BIOS interrupts. Jump to 32-bit mode.
Expand Down
3 changes: 1 addition & 2 deletions src/arch/x86_64/pure64.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ STAGE3 equ 0x60000 ; Stage three bootloader is at this address.
start:
jmp start32 ; This command will be overwritten with 'NOP's before the AP's are started
nop
nop
nop
db 0x36, 0x34

; =============================================================================
; Code for AP startup
Expand Down