vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_aarch64' into 'master'

Browse Source 
Fix unaligned_references error on aarch64

See merge request redox-os/kernel!213
This commit is contained in:
Jeremy Soller
2023-05-06 16:37:06 +00:00
parent 89d560e6e5 a451c0aa1b
commit 34894e3d73
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/aarch64/start.rs
+7 -7
View File
@@ -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" {
src/context/arch/aarch64.rs
+2 -2
View File
@@ -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
);