Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bootloader
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
bootloader
Commits
fb6cd07c
Commit
fb6cd07c
authored
8 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Get the APs into rust code, set stack and page table in trampoline
parent
d834fa7c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
x86/bootsector.asm
+25
-25
25 additions, 25 deletions
x86/bootsector.asm
x86/startup-x86_64.asm
+9
-3
9 additions, 3 deletions
x86/startup-x86_64.asm
with
34 additions
and
28 deletions
x86/bootsector.asm
+
25
−
25
View file @
fb6cd07c
...
...
@@ -65,31 +65,31 @@ load:
mov
[
DAPACK.count
],
cx
mov
[
DAPACK.seg
],
dx
mov
si
,
loading
call
print
mov
bx
,
[
DAPACK.addr
]
call
print_num
mov
al
,
'#'
call
print_char
mov
bx
,
[
DAPACK.count
]
call
print_num
mov
al
,
' '
call
print_char
mov
bx
,
[
DAPACK.seg
]
call
print_num
mov
al
,
':'
call
print_char
mov
bx
,
[
DAPACK.buf
]
call
print_num
call
print_line
;
mov si, loading
;
call print
;
mov bx, [DAPACK.addr]
;
call print_num
;
mov al, '#'
;
call print_char
;
;
mov bx, [DAPACK.count]
;
call print_num
;
;
mov al, ' '
;
call print_char
;
;
mov bx, [DAPACK.seg]
;
call print_num
;
;
mov al, ':'
;
call print_char
;
;
mov bx, [DAPACK.buf]
;
call print_num
;
;
call print_line
mov
dl
,
[
di
sk
]
mov
si
,
DAPACK
...
...
This diff is collapsed.
Click to expand it.
x86/startup-x86_64.asm
+
9
−
3
View file @
fb6cd07c
trampoline:
.ready:
dq
0
.page_table:
dq
0
.stack:
dq
0
.code:
dq
0
times
512
-
(
$
-
trampoline
)
db
0
...
...
@@ -126,10 +128,14 @@ long_mode_ap:
mov
gs
,
rax
mov
ss
,
rax
mov
rax
,
[
trampoline.page_table
]
mov
cr3
,
rax
mov
rsp
,
[
trampoline.stack
]
mov
qword
[
trampoline.ready
],
1
.lp:
hlt
jmp
.lp
mov
rax
,
[
trampoline.code
]
jmp
rax
gdtr:
dw
gdt.end
+
1
; size
...
...
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