mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Merge branch 'master' into debugger
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
commit
13204d1714
11 changed files with 95 additions and 12 deletions
|
|
@ -1962,6 +1962,16 @@ impl SystemServices {
|
||||||
server.discard_messages_for_pid(target_pid);
|
server.discard_messages_for_pid(target_pid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Now that the server has been "Disconnected", free the server entry.
|
||||||
|
for server in self.servers.iter_mut() {
|
||||||
|
if let Some(server_inner) = server {
|
||||||
|
if server_inner.pid == target_pid {
|
||||||
|
*server = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let process = self.get_process_mut(target_pid)?;
|
let process = self.get_process_mut(target_pid)?;
|
||||||
process.activate()?;
|
process.activate()?;
|
||||||
let parent_pid = process.ppid;
|
let parent_pid = process.ppid;
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ enum ExecutionType {
|
||||||
NonBlocking,
|
NonBlocking,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(baremetal)]
|
||||||
pub fn reset_switchto_caller() {
|
pub fn reset_switchto_caller() {
|
||||||
unsafe { SWITCHTO_CALLER = None };
|
unsafe { SWITCHTO_CALLER = None };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -687,6 +687,8 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se
|
||||||
eprintln!("Server shut down: {}", e);
|
eprintln!("Server shut down: {}", e);
|
||||||
std::process::exit(0);
|
std::process::exit(0);
|
||||||
}
|
}
|
||||||
|
data.shrink_to_fit();
|
||||||
|
assert_eq!(data.len(), data.capacity());
|
||||||
let len = data.len();
|
let len = data.len();
|
||||||
let addr = data.as_mut_ptr();
|
let addr = data.as_mut_ptr();
|
||||||
memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap();
|
memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -19,22 +19,82 @@ _xous_syscall:
|
||||||
sw a7, 7*REGBYTES(t0)
|
sw a7, 7*REGBYTES(t0)
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.global aes_enc_round
|
.global vex_aes_enc_id_0
|
||||||
aes_enc_round:
|
vex_aes_enc_id_0:
|
||||||
.word 0xb5050b // aes_enc_round a0, a1, a0
|
.word 0x00b5050b // vex_aes_enc_id a0, a1, a0, #0
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.global aes_enc_round_last
|
.global vex_aes_enc_id_1
|
||||||
aes_enc_round_last:
|
vex_aes_enc_id_1:
|
||||||
.word 0x4b5050b // aes_enc_round_last a0, a1, a0
|
.word 0x10b5050b // vex_aes_enc_id a0, a1, a0, #1
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.global aes_dec_round
|
.global vex_aes_enc_id_2
|
||||||
aes_dec_round:
|
vex_aes_enc_id_2:
|
||||||
.word 0x2b5050b // aes_dec_round a0, a1, a0
|
.word 0x20b5050b // vex_aes_enc_id a0, a1, a0, #2
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.global aes_dec_round_last
|
.global vex_aes_enc_id_3
|
||||||
aes_dec_round_last:
|
vex_aes_enc_id_3:
|
||||||
.word 0x6b5050b // aes_dec_round_last a0, a1, a0
|
.word 0x30b5050b // vex_aes_enc_id a0, a1, a0, #3
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_enc_id_last_0
|
||||||
|
vex_aes_enc_id_last_0:
|
||||||
|
.word 0x04b5050b // vex_aes_enc_id_last a0, a1, a0, #0
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_enc_id_last_1
|
||||||
|
vex_aes_enc_id_last_1:
|
||||||
|
.word 0x14b5050b // vex_aes_enc_id_last a0, a1, a0, #1
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_enc_id_last_2
|
||||||
|
vex_aes_enc_id_last_2:
|
||||||
|
.word 0x24b5050b // vex_aes_enc_id_last a0, a1, a0, #2
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_enc_id_last_3
|
||||||
|
vex_aes_enc_id_last_3:
|
||||||
|
.word 0x34b5050b // vex_aes_enc_id_last a0, a1, a0, #3
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_0
|
||||||
|
vex_aes_dec_id_0:
|
||||||
|
.word 0x02b5050b // vex_aes_dec_id a0, a1, a0, #0
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_1
|
||||||
|
vex_aes_dec_id_1:
|
||||||
|
.word 0x12b5050b // vex_aes_dec_id a0, a1, a0, #1
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_2
|
||||||
|
vex_aes_dec_id_2:
|
||||||
|
.word 0x22b5050b // vex_aes_dec_id a0, a1, a0, #2
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_3
|
||||||
|
vex_aes_dec_id_3:
|
||||||
|
.word 0x32b5050b // vex_aes_dec_id a0, a1, a0, #3
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_last_0
|
||||||
|
vex_aes_dec_id_last_0:
|
||||||
|
.word 0x06b5050b // vex_aes_dec_id_last a0, a1, a0, #0
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_last_1
|
||||||
|
vex_aes_dec_id_last_1:
|
||||||
|
.word 0x16b5050b // vex_aes_dec_id_last a0, a1, a0, #1
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_last_2
|
||||||
|
vex_aes_dec_id_last_2:
|
||||||
|
.word 0x26b5050b // vex_aes_dec_id_last a0, a1, a0, #2
|
||||||
|
ret
|
||||||
|
|
||||||
|
.global vex_aes_dec_id_last_3
|
||||||
|
vex_aes_dec_id_last_3:
|
||||||
|
.word 0x36b5050b // vex_aes_dec_id_last a0, a1, a0, #3
|
||||||
ret
|
ret
|
||||||
|
|
|
||||||
|
|
@ -587,6 +587,16 @@ impl Drop for MessageEnvelope {
|
||||||
.expect("couldn't return memory")
|
.expect("couldn't return memory")
|
||||||
}
|
}
|
||||||
Message::Move(msg) => {
|
Message::Move(msg) => {
|
||||||
|
// Reconstitute the vec and drop it right away to ensure it's freed.
|
||||||
|
#[cfg(any(unix, windows))]
|
||||||
|
let _v = unsafe {
|
||||||
|
std::vec::Vec::from_raw_parts(
|
||||||
|
msg.buf.as_mut_ptr(),
|
||||||
|
msg.buf.len(),
|
||||||
|
msg.buf.len(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
#[cfg(not(any(unix, windows)))]
|
||||||
crate::syscall::unmap_memory(msg.buf).expect("couldn't free memory message")
|
crate::syscall::unmap_memory(msg.buf).expect("couldn't free memory message")
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue