Skip to content

Blocks #97

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 2 commits into from
Jun 28, 2025
+29 −9
Merged

Blocks #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37b49f4
Output 8 blocks instead of 4
Jun 26, 2025
90c8194
Remove dubug `jmp $`
Jun 26, 2025
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
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Return Infinity
Copyright (c) 2025 Return Infinity

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions src/init/hpet.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
init_hpet:
; Verify there is a valid HPET address
mov rax, [p_HPET_Address]
cmp rax, 0
jz os_hpet_init_error

; Verify the capabilities of HPET
Expand Down
35 changes: 27 additions & 8 deletions src/pure64.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ start64:
mov eax, 0x00404040
rep stosd

; Visual Debug (1/4)
; Visual Debug (1/8)
mov ebx, 0
call debug_block

Expand Down Expand Up @@ -394,7 +394,7 @@ clearcs64:

lgdt [GDTR64] ; Reload the GDT

; Visual Debug (2/4)
; Visual Debug (2/8)
mov ebx, 2
call debug_block

Expand Down Expand Up @@ -711,12 +711,26 @@ pde_end:
and cl, 1
mov byte [p_x2APIC], cl

; Visual Debug (3/8)
mov ebx, 4
call debug_block

call init_acpi ; Find and process the ACPI tables

; Visual Debug (4/8)
mov ebx, 6
call debug_block

call init_cpu ; Configure the BSP CPU

; Visual Debug (5/8)
mov ebx, 8
call debug_block

call init_hpet ; Configure the HPET

; Visual Debug (3/4)
mov ebx, 4
; Visual Debug (6/8)
mov ebx, 10
call debug_block

call init_smp ; Init of SMP, deactivate interrupts
Expand Down Expand Up @@ -810,6 +824,10 @@ no_address_size:
mov al, [p_x2APIC]
stosb

; Visual Debug (7/8)
mov ebx, 12
call debug_block

; Set the Linear Frame Buffer to use write-combining
mov eax, 0x80000001
cpuid
Expand Down Expand Up @@ -864,8 +882,8 @@ lfb_wc_end:
mov ecx, ((32768 - PURE64SIZE) / 8)
rep movsq ; Copy 8 bytes at a time

; Visual Debug (4/4)
mov ebx, 6
; Visual Debug (8/8)
mov ebx, 14
call debug_block

%ifdef BIOS
Expand Down Expand Up @@ -937,11 +955,12 @@ debug_block:
shl edx, 2 ; Quick multiply by 4 for line offset
xor ecx, ecx
mov cx, [0x00005F00 + 0x10] ; Screen X
shr cx, 4 ; CX = total amount of 8-pixel wide blocks
sub cx, 4
shr cx, 4 ; Quick divide by 16 (box width plus blank width)
sub cx, 8 ; CX = total amount of 8-pixel wide blocks
add ebx, ecx
shl ebx, 5 ; Quick multiply by 32 (8 pixels by 4 bytes each)
add rdi, rbx
sub rdi, 16 ; Move left by half a box width (4 pixels by 4 bytes each)

; Draw the 8x8 pixel block
mov ebx, 8 ; 8 pixels tall
Expand Down