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
a451c0aa
Verified
Commit
a451c0aa
authored
1 year ago
by
Jacob Lorentzon
Browse files
Options
Downloads
Patches
Plain Diff
Fix aarch64 build.
parent
89d560e6
No related branches found
Branches containing commit
No related tags found
1 merge request
!213
Fix unaligned_references error on aarch64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/arch/aarch64/start.rs
+7
-7
7 additions, 7 deletions
src/arch/aarch64/start.rs
src/context/arch/aarch64.rs
+2
-2
2 additions, 2 deletions
src/context/arch/aarch64.rs
with
9 additions
and
9 deletions
src/arch/aarch64/start.rs
+
7
−
7
View file @
a451c0aa
...
...
@@ -104,13 +104,13 @@ pub unsafe extern fn kstart(args_ptr: *const KernelArgs) -> ! {
});
info!
(
"Redox OS starting..."
);
info!
(
"Kernel: {:X}:{:X}"
,
args
.kernel_base
,
args
.kernel_base
+
args
.kernel_size
);
info!
(
"Stack: {:X}:{:X}"
,
args
.stack_base
,
args
.stack_base
+
args
.stack_size
);
info!
(
"Env: {:X}:{:X}"
,
args
.env_base
,
args
.env_base
+
args
.env_size
);
info!
(
"RSDPs: {:X}:{:X}"
,
args
.dtb_base
,
args
.dtb_base
+
args
.dtb_size
);
info!
(
"Areas: {:X}:{:X}"
,
args
.areas_base
,
args
.areas_base
+
args
.areas_size
);
info!
(
"Bootstrap: {:X}:{:X}"
,
args
.bootstrap_base
,
args
.bootstrap_base
+
args
.bootstrap_size
);
info!
(
"Bootstrap entry point: {:X}"
,
args
.bootstrap_entry
);
info!
(
"Kernel: {:X}:{:X}"
,
{
args
.kernel_base
}
,
args
.kernel_base
+
args
.kernel_size
);
info!
(
"Stack: {:X}:{:X}"
,
{
args
.stack_base
}
,
args
.stack_base
+
args
.stack_size
);
info!
(
"Env: {:X}:{:X}"
,
{
args
.env_base
}
,
args
.env_base
+
args
.env_size
);
info!
(
"RSDPs: {:X}:{:X}"
,
{
args
.dtb_base
}
,
args
.dtb_base
+
args
.dtb_size
);
info!
(
"Areas: {:X}:{:X}"
,
{
args
.areas_base
}
,
args
.areas_base
+
args
.areas_size
);
info!
(
"Bootstrap: {:X}:{:X}"
,
{
args
.bootstrap_base
}
,
args
.bootstrap_base
+
args
.bootstrap_size
);
info!
(
"Bootstrap entry point: {:X}"
,
{
args
.bootstrap_entry
}
);
// Setup interrupt handlers
extern
"C"
{
...
...
This diff is collapsed.
Click to expand it.
src/context/arch/aarch64.rs
+
2
−
2
View file @
a451c0aa
...
...
@@ -186,7 +186,7 @@ pub unsafe fn switch_to(prev: &mut super::Context, next: &mut super::Context) {
"stp q30, q31, [{0}, #16 * 30]"
,
"mrs {1}, fpcr"
,
"mrs {2}, fpsr"
,
in
(
reg
)
&
mut
float_regs
.fp_simd_regs
,
in
(
reg
)
core
::
ptr
::
addr_of_
mut
!
(
float_regs
.fp_simd_regs
)
,
out
(
reg
)
float_regs
.fpcr
,
out
(
reg
)
float_regs
.fpsr
);
...
...
@@ -214,7 +214,7 @@ pub unsafe fn switch_to(prev: &mut super::Context, next: &mut super::Context) {
"ldp q30, q31, [{0}, #16 * 30]"
,
"msr fpcr, {1}"
,
"msr fpsr, {2}"
,
in
(
reg
)
&
mut
float_regs
.fp_simd_regs
,
in
(
reg
)
core
::
ptr
::
addr_of_
mut
!
(
float_regs
.fp_simd_regs
)
,
in
(
reg
)
float_regs
.fpcr
,
in
(
reg
)
float_regs
.fpsr
);
...
...
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