Skip to content

Commit 6a496e9

Browse files
authored
Merge pull request #107 from ReturnInfinity/qa
Qa
2 parents 7918f4a + 2c82c26 commit 6a496e9

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ The Pure64 information table is located at `0x0000000000005000` and ends at `0x0
216216
<tr><td>0x50E1</td><td>8-bit</td><td>FLAG_X2APIC</td><td>1 if X2APIC is supported</td></tr>
217217
<tr><td>0x50E2</td><td>8-bit</td><td>FLAG_BOOTMODE</td><td>'B' if BIOS, 'U' for UEFI</td></tr>
218218
<tr><td>0x50E3 - 0x50FF</td><td>&nbsp;</td><td>&nbsp;</td><td>For future use</td></tr>
219-
<tr><td>0x5100 - 0x51FF</td><td>8-bit</td><td>APIC_ID</td><td>APIC ID's for valid CPU cores (based on CORES_ACTIVE)</td></tr>
219+
<tr><td>0x5100 - 0x51FF</td><td>32-bit</td><td>APIC_ID</td><td>APIC ID's for valid CPU cores (based on CORES_ACTIVE)</td></tr>
220220
<tr><td>0x5200 - 0x53FF</td><td>&nbsp;</td><td>&nbsp;</td><td>For future use</td></tr>
221221
<tr><td>0x5400 - 0x55FF</td><td>16 byte entries</td><td>PCIE</td><td>PCIe bus data</td></tr>
222222
<tr><td>0x5600 - 0x56FF</td><td>16 byte entries</td><td>IOAPIC</td><td>I/O APIC addresses (based on IOAPIC_COUNT)</td></tr>

src/pure64.asm

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,7 @@ create_pdpe_high:
712712
stosq
713713
add rax, 0x00001000 ; 4K later (512 records x 8 bytes)
714714
dec ecx
715-
cmp ecx, 0
716-
jne create_pdpe_high
715+
jnz create_pdpe_high
717716

718717
; Create the High Page-Directory Entries (PDE).
719718
; A single PDE can map 2MiB of RAM
@@ -737,11 +736,8 @@ skipfirst4mb:
737736
pde_high: ; Create a 2MiB page
738737
stosq
739738
add rax, 0x00200000 ; Increment by 2MiB
740-
cmp ecx, 0
741-
je pde_next_range
742739
dec ecx
743-
cmp ecx, 0
744-
jne pde_high
740+
jnz pde_high
745741
jmp pde_next_range
746742
pde_end:
747743

src/sysvar.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ VBEModeInfoBlock: equ 0x0000000000005F00 ; 256 bytes
3939
; DQ - Starting at offset 0, increments by 0x8
4040
p_ACPITableAddress: equ SystemVariables + 0x00
4141
p_HPET_CyclesPerUs: equ SystemVariables + 0x08 ; Precomputed HPET cycles per microsecond
42-
p_LocalAPICAddress: equ SystemVariables + 0x10
42+
p_LocalAPICAddress: equ SystemVariables + 0x10 ; Address of the Local APIC (xAPIC)
4343
p_HPET_Address: equ SystemVariables + 0x28
4444
sys_timer: equ SystemVariables + 0x30
4545
p_EBDA: equ SystemVariables + 0x38

0 commit comments

Comments
 (0)