Skip to content

aarch64: fix user space use error trampsize after change it #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guoweikang merged 2 commits into from
Oct 22, 2025
Merged

aarch64: fix user space use error trampsize after change it #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
929430b
aarch64: fix user space use error trampsize after change it
guoweikang Oct 22, 2025
954a838
aarch64: change traofrme pad type to u64
guoweikang Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aarch64/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub struct TrapFrame {
pub spsr: u64,

/// make sure the size is 16 bytes aligned
pub __pad: [u8; 8],
pub __pad: u64,
}

impl fmt::Debug for TrapFrame {
Expand Down
8 changes: 4 additions & 4 deletions src/aarch64/trap.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ exception_vector_base:

mrs x8, sp_el0
mrs x9, tpidr_el0
ldp x10, x11, [x1, 33 * 8]
stp x8, x9, [x1, 33 * 8]
ldp x10, x11, [x1, {trapframe_size}]
stp x8, x9, [x1, {trapframe_size}]
mov sp, x10
msr tpidr_el0, x11

Expand All @@ -124,8 +124,8 @@ enter_user:

mov x10, sp
mrs x11, tpidr_el0
ldp x8, x9, [x0, 33 * 8]
stp x10, x11, [x0, 33 * 8]
ldp x8, x9, [x0, {trapframe_size}]
stp x10, x11, [x0,{trapframe_size}]
msr sp_el0, x8
msr tpidr_el0, x9

Expand Down
2 changes: 1 addition & 1 deletion src/aarch64/uspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl UserContext {
+ SPSR_EL1::I::Unmasked
+ SPSR_EL1::F::Masked)
.value,
__pad: [0; 8],
__pad: 0,
},
sp: ustack_top.as_usize() as _,
tpidr: 0,
Expand Down