Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
kernel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
kernel
Commits
33b8fcec
Verified
Commit
33b8fcec
authored
2 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Sync x86_64 trampoline with bootloader
parent
fb1bdf7c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/asm/x86_64/trampoline.asm
+5
-6
5 additions, 6 deletions
src/asm/x86_64/trampoline.asm
with
5 additions
and
6 deletions
src/asm/x86_64/trampoline.asm
+
5
−
6
View file @
33b8fcec
...
...
@@ -26,24 +26,22 @@ startup_ap:
; initialize stack to invalid value
mov
sp
,
0
;cr3 holds pointer to PML4
;
cr3 holds pointer to PML4
mov
edi
,
[
trampoline.page_table
]
mov
cr3
,
edi
;
E
nable FPU
;
e
nable FPU
mov
eax
,
cr0
and
al
,
11110011b
; Clear task switched (3) and emulation (2)
or
al
,
00100010b
; Set numeric error (5) monitor co-processor (1)
mov
cr0
,
eax
; 18: Enable OSXSAVE
; 10: Unmasked SSE exceptions
; 9: FXSAVE/FXRSTOR
; 7: Page Global
; 5: Page Address Extension
; 4: Page Size Extension
mov
eax
,
cr4
or
eax
,
1
<<
18
|
1
<<
10
|
1
<<
9
|
1
<<
7
|
1
<<
5
|
1
<<
4
or
eax
,
1
<<
9
|
1
<<
7
|
1
<<
5
|
1
<<
4
mov
cr4
,
eax
; initialize floating point registers
...
...
@@ -52,12 +50,13 @@ startup_ap:
; load protected mode GDT
lgdt
[
gdtr
]
; enable long mode
mov
ecx
,
0xC0000080
; Read from the EFER MSR.
rdmsr
or
eax
,
1
<<
11
|
1
<<
8
; Set the Long-Mode-Enable and NXE bit.
wrmsr
;enabling paging and protection simultaneously
;
enabling paging and protection simultaneously
mov
ebx
,
cr0
; 31: Paging
; 16: write protect kernel
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment