diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 4f37f7f2d..8bc925d09 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1962,6 +1962,16 @@ impl SystemServices { 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)?; process.activate()?; let parent_pid = process.ppid; diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 239efde92..be97a890c 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -30,6 +30,7 @@ enum ExecutionType { NonBlocking, } +#[cfg(baremetal)] pub fn reset_switchto_caller() { unsafe { SWITCHTO_CALLER = None }; } diff --git a/xous-rs/bin/riscv32i-unknown-none-elf.a b/xous-rs/bin/riscv32i-unknown-none-elf.a index 0af7945fd..4eb32a794 100644 Binary files a/xous-rs/bin/riscv32i-unknown-none-elf.a and b/xous-rs/bin/riscv32i-unknown-none-elf.a differ diff --git a/xous-rs/bin/riscv32imac-unknown-none-elf.a b/xous-rs/bin/riscv32imac-unknown-none-elf.a index e9e31da1b..44d65f411 100644 Binary files a/xous-rs/bin/riscv32imac-unknown-none-elf.a and b/xous-rs/bin/riscv32imac-unknown-none-elf.a differ diff --git a/xous-rs/bin/riscv32imac-unknown-xous-elf.a b/xous-rs/bin/riscv32imac-unknown-xous-elf.a deleted file mode 100644 index 73802b359..000000000 Binary files a/xous-rs/bin/riscv32imac-unknown-xous-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv32imc-unknown-none-elf.a b/xous-rs/bin/riscv32imc-unknown-none-elf.a index e9e31da1b..44d65f411 100644 Binary files a/xous-rs/bin/riscv32imc-unknown-none-elf.a and b/xous-rs/bin/riscv32imc-unknown-none-elf.a differ diff --git a/xous-rs/bin/riscv64gc-unknown-none-elf.a b/xous-rs/bin/riscv64gc-unknown-none-elf.a index aa1433070..e9d7fb9f3 100644 Binary files a/xous-rs/bin/riscv64gc-unknown-none-elf.a and b/xous-rs/bin/riscv64gc-unknown-none-elf.a differ diff --git a/xous-rs/bin/riscv64imac-unknown-none-elf.a b/xous-rs/bin/riscv64imac-unknown-none-elf.a index aa1433070..e9d7fb9f3 100644 Binary files a/xous-rs/bin/riscv64imac-unknown-none-elf.a and b/xous-rs/bin/riscv64imac-unknown-none-elf.a differ diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index 7efe75c4c..add46d0d9 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -687,6 +687,8 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se eprintln!("Server shut down: {}", e); std::process::exit(0); } + data.shrink_to_fit(); + assert_eq!(data.len(), data.capacity()); let len = data.len(); let addr = data.as_mut_ptr(); memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap(); diff --git a/xous-rs/src/asm.S b/xous-rs/src/asm.S index 3b1c02a7b..75e434c87 100644 --- a/xous-rs/src/asm.S +++ b/xous-rs/src/asm.S @@ -19,22 +19,82 @@ _xous_syscall: sw a7, 7*REGBYTES(t0) ret -.global aes_enc_round -aes_enc_round: - .word 0xb5050b // aes_enc_round a0, a1, a0 +.global vex_aes_enc_id_0 +vex_aes_enc_id_0: + .word 0x00b5050b // vex_aes_enc_id a0, a1, a0, #0 ret -.global aes_enc_round_last -aes_enc_round_last: - .word 0x4b5050b // aes_enc_round_last a0, a1, a0 +.global vex_aes_enc_id_1 +vex_aes_enc_id_1: + .word 0x10b5050b // vex_aes_enc_id a0, a1, a0, #1 ret -.global aes_dec_round -aes_dec_round: - .word 0x2b5050b // aes_dec_round a0, a1, a0 +.global vex_aes_enc_id_2 +vex_aes_enc_id_2: + .word 0x20b5050b // vex_aes_enc_id a0, a1, a0, #2 ret -.global aes_dec_round_last -aes_dec_round_last: - .word 0x6b5050b // aes_dec_round_last a0, a1, a0 +.global vex_aes_enc_id_3 +vex_aes_enc_id_3: + .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 diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 0b27b599d..d15c81d4d 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -587,6 +587,16 @@ impl Drop for MessageEnvelope { .expect("couldn't return memory") } 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") } _ => (),