mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
Merge branch 'main' into warnings
This commit is contained in:
commit
96839568f4
7 changed files with 29 additions and 20 deletions
|
|
@ -411,7 +411,7 @@ pub extern "C" fn trap_handler(
|
|||
ex
|
||||
);
|
||||
#[cfg(any(feature = "precursor", feature = "renode"))]
|
||||
panic!(
|
||||
println!(
|
||||
"{}: CPU Exception on PID {}: {}",
|
||||
if is_kernel_failure {
|
||||
"!!! KERNEL FAILURE !!!"
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ pub fn report_stop(_pid: xous_kernel::PID, tid: xous_kernel::TID, _pc: usize) {
|
|||
};
|
||||
}
|
||||
|
||||
pub fn report_terminated(_pid: xous_kernel::PID) {
|
||||
pub fn report_terminated(pid: xous_kernel::PID) {
|
||||
let Some(XousDebugState {
|
||||
mut target,
|
||||
server: gdb,
|
||||
|
|
@ -306,7 +306,6 @@ pub fn report_terminated(_pid: xous_kernel::PID) {
|
|||
|
||||
let new_gdb = match gdb {
|
||||
GdbStubStateMachine::Running(inner) => {
|
||||
println!("Reporting a STOP");
|
||||
match inner.report_stop(
|
||||
&mut target,
|
||||
MultiThreadStopReason::Signal(Signal::EXC_BAD_ACCESS),
|
||||
|
|
@ -326,9 +325,9 @@ pub fn report_terminated(_pid: xous_kernel::PID) {
|
|||
println!("GDB state was in Disconnect, which shouldn't be possible!");
|
||||
return;
|
||||
}
|
||||
GdbStubStateMachine::Idle(_inner) => {
|
||||
println!("GDB state was in Idle, which shouldn't be possible!");
|
||||
return;
|
||||
GdbStubStateMachine::Idle(inner) => {
|
||||
println!("Please connect a debugger to debug process {}", pid);
|
||||
GdbStubStateMachine::Idle(inner)
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ fn set_encrypt_key_inner_128(user_key: &[u8], swap_final: bool) -> VexKeys128 {
|
|||
^ (TE2[(temp >> 16) & 0xff] & 0xff000000)
|
||||
^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000)
|
||||
^ (TE0[(temp) & 0xff] & 0x0000ff00)
|
||||
^ (TE1[(temp >> 24)] & 0x000000ff)
|
||||
^ (TE1[temp >> 24] & 0x000000ff)
|
||||
^ rcon;
|
||||
rk[5 + rk_offset] = rk[1 + rk_offset] ^ rk[4 + rk_offset];
|
||||
rk[6 + rk_offset] = rk[2 + rk_offset] ^ rk[5 + rk_offset];
|
||||
|
|
@ -68,19 +68,19 @@ pub fn aes128_dec_key_schedule(user_key: &[u8]) -> VexKeys128 {
|
|||
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
|
||||
let mut rk_offset = 4;
|
||||
for _ in 1..rounds {
|
||||
rk[0 + rk_offset] = TD0[TE1[(rk[0 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[0 + rk_offset] = TD0[TE1[rk[0 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[0 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[0 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[0 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[1 + rk_offset] = TD0[TE1[(rk[1 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[1 + rk_offset] = TD0[TE1[rk[1 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[1 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[1 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[1 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[2 + rk_offset] = TD0[TE1[(rk[2 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[2 + rk_offset] = TD0[TE1[rk[2 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[2 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[2 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[2 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[3 + rk_offset] = TD0[TE1[(rk[3 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[3 + rk_offset] = TD0[TE1[rk[3 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[3 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[3 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[3 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ fn set_encrypt_key_inner_256(user_key: &[u8], swap_final: bool) -> VexKeys256 {
|
|||
^ (TE2[(temp >> 16) & 0xff] & 0xff000000)
|
||||
^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000)
|
||||
^ (TE0[(temp) & 0xff] & 0x0000ff00)
|
||||
^ (TE1[(temp >> 24)] & 0x000000ff)
|
||||
^ (TE1[temp >> 24] & 0x000000ff)
|
||||
^ rcon;
|
||||
rk[9 + rk_offset] = rk[1 + rk_offset] ^ rk[8 + rk_offset];
|
||||
rk[10 + rk_offset] = rk[2 + rk_offset] ^ rk[9 + rk_offset];
|
||||
|
|
@ -39,7 +39,7 @@ fn set_encrypt_key_inner_256(user_key: &[u8], swap_final: bool) -> VexKeys256 {
|
|||
|
||||
let temp = rk[11 + rk_offset] as usize;
|
||||
rk[12 + rk_offset] = rk[4 + rk_offset]
|
||||
^ (TE2[(temp >> 24)] & 0xff000000)
|
||||
^ (TE2[temp >> 24] & 0xff000000)
|
||||
^ (TE3[(temp >> 16) & 0xff] & 0x00ff0000)
|
||||
^ (TE0[(temp >> 8) & 0xff] & 0x0000ff00)
|
||||
^ (TE1[(temp) & 0xff] & 0x000000ff);
|
||||
|
|
@ -90,19 +90,19 @@ pub fn aes256_dec_key_schedule(user_key: &[u8]) -> VexKeys256 {
|
|||
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
|
||||
let mut rk_offset = 4;
|
||||
for _ in 1..rounds {
|
||||
rk[0 + rk_offset] = TD0[TE1[(rk[0 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[0 + rk_offset] = TD0[TE1[rk[0 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[0 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[0 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[0 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[1 + rk_offset] = TD0[TE1[(rk[1 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[1 + rk_offset] = TD0[TE1[rk[1 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[1 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[1 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[1 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[2 + rk_offset] = TD0[TE1[(rk[2 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[2 + rk_offset] = TD0[TE1[rk[2 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[2 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[2 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[2 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
rk[3 + rk_offset] = TD0[TE1[(rk[3 + rk_offset] as usize >> 24)] as usize & 0xff]
|
||||
rk[3 + rk_offset] = TD0[TE1[rk[3 + rk_offset] as usize >> 24] as usize & 0xff]
|
||||
^ TD1[TE1[(rk[3 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
|
||||
^ TD2[TE1[(rk[3 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
|
||||
^ TD3[TE1[(rk[3 + rk_offset] as usize) & 0xff] as usize & 0xff];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,17 @@ struct ScalarCallback {
|
|||
cb_to_client_id: u32,
|
||||
}
|
||||
|
||||
fn main() -> ! {
|
||||
fn main () -> ! {
|
||||
let stack_size = 256 * 1024;
|
||||
std::thread::Builder::new()
|
||||
.stack_size(stack_size)
|
||||
.spawn(wrapped_main)
|
||||
.unwrap()
|
||||
.join()
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
fn wrapped_main() -> ! {
|
||||
log_server::init_wait().unwrap();
|
||||
log::set_max_level(log::LevelFilter::Info);
|
||||
info!("my PID is {}", xous::process::id());
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@ debuginject = [] # used only if you want direct key injection via serial or USB.
|
|||
rawserial = []
|
||||
braille = []
|
||||
inject-api = [] # used by the serial feature in usb
|
||||
default = ["debuginject", "inject-api"] # "debugprint"
|
||||
default = ["debuginject"] # "debugprint"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ num-traits = {version = "0.2.14", default-features = false}
|
|||
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
|
||||
susres = {package = "xous-api-susres", version = "0.9.36"}
|
||||
modals = {path = "../modals"}
|
||||
keyboard = { path = "../keyboard", features = ["inject-api"] }
|
||||
keyboard = {path = "../keyboard", features=["inject-api"]}
|
||||
bitfield = "0.13.2"
|
||||
vcell = "0.1.3"
|
||||
xous-semver = "0.1.2"
|
||||
|
|
|
|||
Loading…
Reference in a new issue