Jika/redox-kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on x86_64

Browse Source
This commit is contained in:
Jeremy Soller
2022-08-20 14:51:05 -06:00
parent 9dd069c8ca
commit d3f42989c9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/scheme/proc.rs
View File

@@ -399,13 +399,13 @@ impl ProcScheme {
}
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
fn read_env_regs(&self) -> Result<EnvRegisters> {
fn read_env_regs(&self, info: &Info) -> Result<EnvRegisters> {
//TODO: Support other archs
Err(Error::new(EINVAL))
}
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
fn read_env_regs(&self) -> Result<EnvRegisters> {
fn read_env_regs(&self, info: &Info) -> Result<EnvRegisters> {
let (fsbase, gsbase) = if info.pid == context::context_id() {
#[cfg(not(feature = "x86_fsgsbase"))]
unsafe {
@@ -437,13 +437,13 @@ impl ProcScheme {
}
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
fn write_env_regs(&self, regs: EnvRegisters) -> Result<()> {
fn write_env_regs(&self, info: &Info, regs: EnvRegisters) -> Result<()> {
//TODO: Support other archs
Err(Error::new(EINVAL))
}
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
fn write_env_regs(&self, regs: EnvRegisters) -> Result<()> {
fn write_env_regs(&self, info: &Info, regs: EnvRegisters) -> Result<()> {
if !(RmmA::virt_is_valid(VirtualAddress::new(regs.fsbase as usize)) && RmmA::virt_is_valid(VirtualAddress::new(regs.gsbase as usize))) {
return Err(Error::new(EINVAL));
}
@@ -678,7 +678,10 @@ impl Scheme for ProcScheme {
}
})?,
RegsKind::Env => {
(Output { env: self.read_env_regs()? }, mem::size_of::<EnvRegisters>())
(
Output { env: self.read_env_regs(&info)? },
mem::size_of::<EnvRegisters>()
)
}
};
@@ -889,7 +892,7 @@ impl Scheme for ProcScheme {
let regs = unsafe {
*(buf as *const _ as *const EnvRegisters)
};
self.write_env_regs(regs)?;
self.write_env_regs(&info, regs)?;
Ok(mem::size_of::<EnvRegisters>())
}
},