mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
kernel: debug: add gdb_server support
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
7371ac7bd5
commit
0332959068
2 changed files with 360 additions and 238 deletions
335
kernel/src/debug/gdb_server.rs
Normal file
335
kernel/src/debug/gdb_server.rs
Normal file
|
|
@ -0,0 +1,335 @@
|
||||||
|
use gdbstub::common::Tid;
|
||||||
|
use gdbstub::target::ext::base::multithread::{
|
||||||
|
GdbInterrupt, MultiThreadOps, ResumeAction, ThreadStopReason,
|
||||||
|
};
|
||||||
|
|
||||||
|
use gdbstub::state_machine::GdbStubStateMachine;
|
||||||
|
use gdbstub::target::ext::base::BaseOps;
|
||||||
|
use gdbstub::target::{Target, TargetResult};
|
||||||
|
|
||||||
|
pub struct XousTarget {
|
||||||
|
pid: Option<xous_kernel::PID>,
|
||||||
|
}
|
||||||
|
pub struct XousDebugState<'a> {
|
||||||
|
pub target: XousTarget,
|
||||||
|
pub server: GdbStubStateMachine<'a, XousTarget, super::Uart>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub static mut GDB_STATE: Option<XousDebugState> = None;
|
||||||
|
pub static mut GDB_BUFFER: [u8; 4096] = [0u8; 4096];
|
||||||
|
|
||||||
|
impl XousTarget {
|
||||||
|
pub fn new() -> XousTarget {
|
||||||
|
XousTarget {
|
||||||
|
// pid: Some(crate::services::SystemServices::with_mut(
|
||||||
|
// |system_services| system_services.current_pid(),
|
||||||
|
pid: xous_kernel::PID::new(2),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn pid(&self) -> &Option<xous_kernel::PID> {
|
||||||
|
&self.pid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Target for XousTarget {
|
||||||
|
type Arch = gdbstub_arch::riscv::Riscv32;
|
||||||
|
type Error = &'static str;
|
||||||
|
fn base_ops(&mut self) -> BaseOps<Self::Arch, Self::Error> {
|
||||||
|
BaseOps::MultiThread(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MultiThreadOps for XousTarget {
|
||||||
|
#[inline(never)]
|
||||||
|
fn resume(
|
||||||
|
&mut self,
|
||||||
|
default_resume_action: ResumeAction,
|
||||||
|
_gdb_interrupt: GdbInterrupt<'_>,
|
||||||
|
) -> Result<Option<ThreadStopReason<u32>>, Self::Error> {
|
||||||
|
match default_resume_action {
|
||||||
|
ResumeAction::Step | ResumeAction::StepWithSignal(_) => {
|
||||||
|
Err("single-stepping not supported")?
|
||||||
|
}
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
|
||||||
|
crate::services::SystemServices::with_mut(|system_services| {
|
||||||
|
system_services.continue_process(self.pid.unwrap()).unwrap()
|
||||||
|
});
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn clear_resume_actions(&mut self) -> Result<(), Self::Error> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn set_resume_action(&mut self, _tid: Tid, _action: ResumeAction) -> Result<(), Self::Error> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn read_registers(
|
||||||
|
&mut self,
|
||||||
|
regs: &mut gdbstub_arch::riscv::reg::RiscvCoreRegs<u32>,
|
||||||
|
tid: Tid,
|
||||||
|
) -> TargetResult<(), Self> {
|
||||||
|
crate::services::SystemServices::with(|system_services| {
|
||||||
|
let current_pid = system_services.current_pid();
|
||||||
|
// gprintln!("Getting registers for thread {}", tid);
|
||||||
|
|
||||||
|
// Actiavte the debugging process and iterate through it,
|
||||||
|
// noting down each active thread.
|
||||||
|
let debugging_pid = self.pid.unwrap();
|
||||||
|
system_services
|
||||||
|
.get_process(debugging_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
let process = crate::arch::process::Process::current();
|
||||||
|
let thread = process.thread(tid.get());
|
||||||
|
regs.x[0] = 0;
|
||||||
|
for (dbg_reg, thr_reg) in regs.x[1..].iter_mut().zip(thread.registers.iter()) {
|
||||||
|
*dbg_reg = (*thr_reg) as u32;
|
||||||
|
}
|
||||||
|
regs.pc = (thread.sepc) as u32;
|
||||||
|
|
||||||
|
// Restore the previous PID
|
||||||
|
system_services
|
||||||
|
.get_process(current_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn write_registers(
|
||||||
|
&mut self,
|
||||||
|
regs: &gdbstub_arch::riscv::reg::RiscvCoreRegs<u32>,
|
||||||
|
tid: Tid,
|
||||||
|
) -> TargetResult<(), Self> {
|
||||||
|
crate::services::SystemServices::with(|system_services| {
|
||||||
|
let current_pid = system_services.current_pid();
|
||||||
|
|
||||||
|
// Actiavte the debugging process and iterate through it,
|
||||||
|
// noting down each active thread.
|
||||||
|
let debugging_pid = self.pid.unwrap();
|
||||||
|
system_services
|
||||||
|
.get_process(debugging_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
let mut process = crate::arch::process::Process::current();
|
||||||
|
let thread = process.thread_mut(tid.get());
|
||||||
|
for (thr_reg, dbg_reg) in thread.registers.iter_mut().zip(regs.x[1..].iter()) {
|
||||||
|
*thr_reg = (*dbg_reg) as usize;
|
||||||
|
}
|
||||||
|
thread.sepc = (regs.pc) as usize;
|
||||||
|
|
||||||
|
// Restore the previous PID
|
||||||
|
system_services
|
||||||
|
.get_process(current_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn read_addrs(
|
||||||
|
&mut self,
|
||||||
|
start_addr: u32,
|
||||||
|
data: &mut [u8],
|
||||||
|
_tid: Tid, // same address space for each core
|
||||||
|
) -> TargetResult<(), Self> {
|
||||||
|
let mut current_addr = start_addr;
|
||||||
|
crate::services::SystemServices::with(|system_services| {
|
||||||
|
let current_pid = system_services.current_pid();
|
||||||
|
|
||||||
|
// Actiavte the debugging process and iterate through it,
|
||||||
|
// noting down each active thread.
|
||||||
|
let debugging_pid = self.pid.unwrap();
|
||||||
|
system_services
|
||||||
|
.get_process(debugging_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
data.iter_mut().for_each(|b| {
|
||||||
|
*b = crate::arch::mem::peek_memory(current_addr as *mut u8).unwrap_or(0x55);
|
||||||
|
current_addr += 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore the previous PID
|
||||||
|
system_services
|
||||||
|
.get_process(current_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn write_addrs(
|
||||||
|
&mut self,
|
||||||
|
start_addr: u32,
|
||||||
|
data: &[u8],
|
||||||
|
_tid: Tid, // same address space for each core
|
||||||
|
) -> TargetResult<(), Self> {
|
||||||
|
let mut current_addr = start_addr;
|
||||||
|
// gprintln!("Writing data to {:08x}", start_addr);
|
||||||
|
crate::services::SystemServices::with(|system_services| {
|
||||||
|
let current_pid = system_services.current_pid();
|
||||||
|
|
||||||
|
// Actiavte the debugging process and iterate through it,
|
||||||
|
// noting down each active thread.
|
||||||
|
let debugging_pid = self.pid.unwrap();
|
||||||
|
system_services
|
||||||
|
.get_process(debugging_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
data.iter().for_each(|b| {
|
||||||
|
if let Err(_e) = crate::arch::mem::poke_memory(current_addr as *mut u8, *b) {
|
||||||
|
// gprintln!("Error writing to {:08x}: {:?}", current_addr, e);
|
||||||
|
}
|
||||||
|
current_addr += 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore the previous PID
|
||||||
|
system_services
|
||||||
|
.get_process(current_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline(never)]
|
||||||
|
fn list_active_threads(
|
||||||
|
&mut self,
|
||||||
|
register_thread: &mut dyn FnMut(Tid),
|
||||||
|
) -> Result<(), Self::Error> {
|
||||||
|
crate::services::SystemServices::with(|system_services| {
|
||||||
|
let current_pid = system_services.current_pid();
|
||||||
|
|
||||||
|
let debugging_pid = self.pid.unwrap();
|
||||||
|
|
||||||
|
// Actiavte the debugging process and iterate through it,
|
||||||
|
// noting down each active thread.
|
||||||
|
system_services
|
||||||
|
.get_process(debugging_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
crate::arch::process::Process::current().for_each_thread_mut(|tid, _thr| {
|
||||||
|
// gprintln!("Registering thread {}", tid);
|
||||||
|
register_thread(Tid::new(tid).unwrap());
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore the previous PID
|
||||||
|
system_services
|
||||||
|
.get_process(current_pid)
|
||||||
|
.unwrap()
|
||||||
|
.activate()
|
||||||
|
.unwrap();
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn handle(b: u8) -> bool {
|
||||||
|
use gdbstub::{DisconnectReason, GdbStubError};
|
||||||
|
if let Some(XousDebugState {
|
||||||
|
mut target,
|
||||||
|
server: gdb,
|
||||||
|
}) = unsafe { GDB_STATE.take() }
|
||||||
|
{
|
||||||
|
// gprintln!("Adding char: {}", b as char);
|
||||||
|
let new_gdb = match gdb {
|
||||||
|
GdbStubStateMachine::Pump(gdb_state) => match gdb_state.pump(&mut target, b) {
|
||||||
|
// Remote disconnected -- leave the `GDB_SERVER` as `None`.
|
||||||
|
Ok((gdb, Some(DisconnectReason::TargetTerminated(r)))) => {
|
||||||
|
// gprintln!("Target halted: {}", r);
|
||||||
|
crate::services::SystemServices::with_mut(|system_services| {
|
||||||
|
system_services
|
||||||
|
.suspend_process(target.pid().unwrap())
|
||||||
|
.unwrap()
|
||||||
|
});
|
||||||
|
gdb
|
||||||
|
}
|
||||||
|
Ok((_, Some(_disconnect_reason))) => {
|
||||||
|
// match disconnect_reason {
|
||||||
|
// DisconnectReason::Disconnect => gprintln!("GDB Disconnected"),
|
||||||
|
// DisconnectReason::TargetExited(_) => gprintln!("Target exited"),
|
||||||
|
// DisconnectReason::TargetTerminated(_) => unreachable!(),
|
||||||
|
// DisconnectReason::Kill => gprintln!("GDB sent a kill command"),
|
||||||
|
// }
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Err(GdbStubError::TargetError(e)) => {
|
||||||
|
// gprintln!("Target raised a fatal error: {}", e);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
// gprintln!("gdbstub internal error: {}", e);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Ok((gdb, None)) => gdb,
|
||||||
|
},
|
||||||
|
|
||||||
|
GdbStubStateMachine::DeferredStopReason(gdb_state) => {
|
||||||
|
match gdb_state.deferred_stop_reason(&mut target, ThreadStopReason::DoneStep) {
|
||||||
|
Ok((gdb, None)) => {
|
||||||
|
crate::services::SystemServices::with_mut(|system_services| {
|
||||||
|
system_services
|
||||||
|
.suspend_process(target.pid().unwrap())
|
||||||
|
.unwrap()
|
||||||
|
});
|
||||||
|
gdb
|
||||||
|
}
|
||||||
|
Ok((_, Some(disconnect_reason))) => {
|
||||||
|
// gprintln!("client disconnected: {:?}", disconnect_reason);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
// gprintln!("deferred_stop_reason_error: {:?}", e);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
unsafe {
|
||||||
|
GDB_STATE = Some(XousDebugState {
|
||||||
|
target,
|
||||||
|
server: new_gdb,
|
||||||
|
})
|
||||||
|
};
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn setup() {
|
||||||
|
match gdbstub::GdbStubBuilder::new(super::Uart {})
|
||||||
|
.with_packet_buffer(unsafe { &mut GDB_BUFFER })
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(gdb) => match gdb.run_state_machine() {
|
||||||
|
Ok(state) => unsafe {
|
||||||
|
GDB_STATE = Some(XousDebugState {
|
||||||
|
target: XousTarget::new(),
|
||||||
|
server: state,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
Err(e) => println!("Unable to start GDB state machine: {}", e),
|
||||||
|
},
|
||||||
|
Err(e) => println!("Unable to start GDB server: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -72,7 +72,7 @@ impl Uart {
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn init(self) {
|
pub fn init(self) {
|
||||||
unsafe { INITIALIZED = true };
|
unsafe { INITIALIZED = true };
|
||||||
let mut uart_csr = CSR::new(0xffcf_0000 as *mut u32);
|
let mut uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
|
||||||
uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1);
|
uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,7 +81,7 @@ impl Uart {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut uart_csr = CSR::new(0xffcf_0000 as *mut u32);
|
let mut uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
|
||||||
// Wait until TXFULL is `0`
|
// Wait until TXFULL is `0`
|
||||||
while uart_csr.r(utra::uart::TXFULL) != 0 {
|
while uart_csr.r(utra::uart::TXFULL) != 0 {
|
||||||
()
|
()
|
||||||
|
|
@ -107,182 +107,38 @@ impl Uart {
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn getc(&self) -> Option<u8> {
|
pub fn getc(&self) -> Option<u8> {
|
||||||
let mut uart_csr = CSR::new(0xffcf_0000 as *mut u32);
|
let uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
|
||||||
// If EV_PENDING_RX is 1, return the pending character.
|
// If EV_PENDING_RX is 1, return the pending character.
|
||||||
// Otherwise, return None.
|
// Otherwise, return None.
|
||||||
match uart_csr.rf(utra::uart::EV_PENDING_RX) {
|
match uart_csr.rf(utra::uart::RXEMPTY_RXEMPTY) {
|
||||||
0 => None,
|
1 => None,
|
||||||
ack => {
|
_ => Some(uart_csr.r(utra::uart::RXTX) as u8),
|
||||||
let c = Some(uart_csr.r(utra::uart::RXTX) as u8);
|
|
||||||
uart_csr.wfo(utra::uart::EV_PENDING_RX, ack);
|
|
||||||
c
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn acknowledge_irq(&self) {
|
||||||
|
let mut uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
|
||||||
|
uart_csr.wfo(utra::uart::EV_PENDING_RX, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(feature = "gdbserver", baremetal))]
|
#[cfg(all(feature = "gdbserver", baremetal))]
|
||||||
mod gdb_server {
|
mod gdb_server;
|
||||||
use gdbstub::common::Tid;
|
|
||||||
use gdbstub::target::ext::base::multithread::{
|
|
||||||
GdbInterrupt, MultiThreadOps, ResumeAction, ThreadStopReason,
|
|
||||||
};
|
|
||||||
|
|
||||||
use gdbstub::state_machine::GdbStubStateMachine;
|
|
||||||
use gdbstub::target::ext::base::BaseOps;
|
|
||||||
use gdbstub::target::{Target, TargetResult};
|
|
||||||
|
|
||||||
pub struct XousTarget {
|
|
||||||
pid: Option<xous_kernel::PID>,
|
|
||||||
tid: Option<xous_kernel::TID>,
|
|
||||||
thread_mask: usize,
|
|
||||||
}
|
|
||||||
pub struct XousDebugState<'a> {
|
|
||||||
pub target: XousTarget,
|
|
||||||
pub server: GdbStubStateMachine<'a, XousTarget, super::Uart>,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub static mut GDB_STATE: Option<XousDebugState> = None;
|
|
||||||
pub static mut GDB_BUFFER: [u8; 4096] = [0u8; 4096];
|
|
||||||
|
|
||||||
impl XousTarget {
|
|
||||||
pub fn new() -> XousTarget {
|
|
||||||
XousTarget {
|
|
||||||
pid: None,
|
|
||||||
tid: None,
|
|
||||||
thread_mask: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Target for XousTarget {
|
|
||||||
type Arch = gdbstub_arch::riscv::Riscv32;
|
|
||||||
type Error = &'static str;
|
|
||||||
fn base_ops(&mut self) -> BaseOps<Self::Arch, Self::Error> {
|
|
||||||
BaseOps::MultiThread(self)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MultiThreadOps for XousTarget {
|
|
||||||
#[inline(never)]
|
|
||||||
fn resume(
|
|
||||||
&mut self,
|
|
||||||
default_resume_action: ResumeAction,
|
|
||||||
gdb_interrupt: GdbInterrupt<'_>,
|
|
||||||
) -> Result<ThreadStopReason<u32>, Self::Error> {
|
|
||||||
match default_resume_action {
|
|
||||||
ResumeAction::Step | ResumeAction::StepWithSignal(_) => {
|
|
||||||
Err("single-stepping not supported")?
|
|
||||||
}
|
|
||||||
_ => (),
|
|
||||||
}
|
|
||||||
|
|
||||||
crate::services::SystemServices::with(|system_services| {
|
|
||||||
let current_pid = system_services.current_pid();
|
|
||||||
|
|
||||||
for process in &system_services.processes {
|
|
||||||
if !process.free() {
|
|
||||||
println!(
|
|
||||||
"PID {} {}:",
|
|
||||||
process.pid,
|
|
||||||
system_services.process_name(process.pid).unwrap_or("")
|
|
||||||
);
|
|
||||||
process.activate().unwrap();
|
|
||||||
crate::arch::mem::MemoryMapping::current().print_map();
|
|
||||||
println!();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
system_services
|
|
||||||
.get_process(current_pid)
|
|
||||||
.unwrap()
|
|
||||||
.activate()
|
|
||||||
.unwrap();
|
|
||||||
});
|
|
||||||
Ok(ThreadStopReason::GdbInterrupt)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn clear_resume_actions(&mut self) -> Result<(), Self::Error> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn set_resume_action(
|
|
||||||
&mut self,
|
|
||||||
_tid: Tid,
|
|
||||||
_action: ResumeAction,
|
|
||||||
) -> Result<(), Self::Error> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn read_registers(
|
|
||||||
&mut self,
|
|
||||||
_regs: &mut gdbstub_arch::riscv::reg::RiscvCoreRegs<u32>,
|
|
||||||
_tid: Tid,
|
|
||||||
) -> TargetResult<(), Self> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn write_registers(
|
|
||||||
&mut self,
|
|
||||||
_regs: &gdbstub_arch::riscv::reg::RiscvCoreRegs<u32>,
|
|
||||||
_tid: Tid,
|
|
||||||
) -> TargetResult<(), Self> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn read_addrs(
|
|
||||||
&mut self,
|
|
||||||
_start_addr: u32,
|
|
||||||
data: &mut [u8],
|
|
||||||
_tid: Tid, // same address space for each core
|
|
||||||
) -> TargetResult<(), Self> {
|
|
||||||
data.iter_mut().for_each(|b| *b = 0x55);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn write_addrs(
|
|
||||||
&mut self,
|
|
||||||
_start_addr: u32,
|
|
||||||
_data: &[u8],
|
|
||||||
_tid: Tid, // same address space for each core
|
|
||||||
) -> TargetResult<(), Self> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline(never)]
|
|
||||||
fn list_active_threads(
|
|
||||||
&mut self,
|
|
||||||
register_thread: &mut dyn FnMut(Tid),
|
|
||||||
) -> Result<(), Self::Error> {
|
|
||||||
// register_thread(Tid::new(1).unwrap());
|
|
||||||
// register_thread(Tid::new(2).unwrap());
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(all(feature = "gdbserver", baremetal))]
|
#[cfg(all(feature = "gdbserver", baremetal))]
|
||||||
impl gdbstub::Connection for Uart {
|
impl gdbstub::Connection for Uart {
|
||||||
type Error = ();
|
type Error = ();
|
||||||
|
|
||||||
fn read(&mut self) -> Result<u8, Self::Error> {
|
|
||||||
Err(())
|
|
||||||
}
|
|
||||||
fn write(&mut self, byte: u8) -> Result<(), Self::Error> {
|
fn write(&mut self, byte: u8) -> Result<(), Self::Error> {
|
||||||
if unsafe { INITIALIZED != true } {
|
if unsafe { INITIALIZED != true } {
|
||||||
Err(())?;
|
Err(())?;
|
||||||
}
|
}
|
||||||
let mut uart_csr = CSR::new(0xffcf_0000 as *mut u32);
|
let mut uart_csr = CSR::new(crate::debug::SUPERVISOR_UART_ADDR as *mut u32);
|
||||||
// Wait until TXFULL is `0`
|
// Wait until TXFULL is not `0`
|
||||||
while uart_csr.r(utra::uart::TXFULL) != 0 {
|
while uart_csr.r(utra::uart::TXFULL) != 0 {
|
||||||
()
|
()
|
||||||
}
|
}
|
||||||
uart_csr.wfo(utra::uart::RXTX_RXTX, byte as u32);
|
uart_csr.wo(utra::uart::RXTX, byte as u32);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
fn peek(&mut self) -> Result<Option<u8>, Self::Error> {
|
fn peek(&mut self) -> Result<Option<u8>, Self::Error> {
|
||||||
|
|
@ -299,53 +155,17 @@ impl gdbstub::Connection for Uart {
|
||||||
any(feature = "debug-print", feature = "print-panics")
|
any(feature = "debug-print", feature = "print-panics")
|
||||||
))]
|
))]
|
||||||
pub fn irq(_irq_number: usize, _arg: *mut usize) {
|
pub fn irq(_irq_number: usize, _arg: *mut usize) {
|
||||||
let b = Uart {}
|
let uart = Uart {};
|
||||||
.getc()
|
while let Some(b) = uart.getc() {
|
||||||
.expect("no character queued despite interrupt");
|
process_irq_character(b);
|
||||||
|
}
|
||||||
|
uart.acknowledge_irq();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn process_irq_character(b: u8) {
|
||||||
#[cfg(feature = "gdbserver")]
|
#[cfg(feature = "gdbserver")]
|
||||||
unsafe {
|
if gdb_server::handle(b) {
|
||||||
use crate::debug::gdb_server::{XousDebugState, GDB_STATE};
|
return;
|
||||||
use gdbstub::state_machine::GdbStubStateMachine;
|
|
||||||
use gdbstub::{DisconnectReason, GdbStubError};
|
|
||||||
if let Some(XousDebugState {
|
|
||||||
mut target,
|
|
||||||
server: gdb,
|
|
||||||
}) = GDB_STATE.take()
|
|
||||||
{
|
|
||||||
let new_gdb = match gdb {
|
|
||||||
GdbStubStateMachine::Pump(gdb_state) => match gdb_state.pump(&mut target, b) {
|
|
||||||
// Remote disconnected -- leave the `GDB_SERVER` as `None`.
|
|
||||||
Ok((_, Some(disconnect_reason))) => {
|
|
||||||
match disconnect_reason {
|
|
||||||
DisconnectReason::Disconnect => println!("GDB Disconnected"),
|
|
||||||
DisconnectReason::TargetExited(_) => println!("Target exited"),
|
|
||||||
DisconnectReason::TargetTerminated(_) => println!("Target halted"),
|
|
||||||
DisconnectReason::Kill => println!("GDB sent a kill command"),
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Err(GdbStubError::TargetError(_e)) => {
|
|
||||||
println!("Target raised a fatal error");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Err(_e) => {
|
|
||||||
println!("gdbstub internal error");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Ok((gdb, None)) => gdb,
|
|
||||||
},
|
|
||||||
// example_no_std stubs out resume, so this will never happen
|
|
||||||
GdbStubStateMachine::DeferredStopReason(_) => {
|
|
||||||
panic!("Deferred stop shouldn't happen")
|
|
||||||
}
|
|
||||||
};
|
|
||||||
GDB_STATE = Some(XousDebugState {
|
|
||||||
target,
|
|
||||||
server: new_gdb,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
match b {
|
match b {
|
||||||
|
|
@ -441,39 +261,8 @@ pub fn irq(_irq_number: usize, _arg: *mut usize) {
|
||||||
}
|
}
|
||||||
#[cfg(feature = "gdbserver")]
|
#[cfg(feature = "gdbserver")]
|
||||||
b'g' => {
|
b'g' => {
|
||||||
use gdb_server::{XousDebugState, XousTarget, GDB_BUFFER, GDB_STATE};
|
|
||||||
println!("Starting GDB server -- attach your debugger now");
|
println!("Starting GDB server -- attach your debugger now");
|
||||||
match gdbstub::GdbStubBuilder::new(Uart {})
|
gdb_server::setup();
|
||||||
.with_packet_buffer(unsafe { &mut GDB_BUFFER })
|
|
||||||
.build()
|
|
||||||
{
|
|
||||||
Ok(gdb) => match gdb.run_state_machine() {
|
|
||||||
Ok(state) => unsafe {
|
|
||||||
GDB_STATE = Some(XousDebugState {
|
|
||||||
target: XousTarget::new(),
|
|
||||||
server: state,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
Err(e) => println!("Unable to start GDB state machine: {}", e),
|
|
||||||
},
|
|
||||||
Err(e) => println!("Unable to start GDB server: {}", e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
b's' => {
|
|
||||||
println!(">>>>>>>>>>>>>>>>>>>>>>>>>>>> Suspenidng PID 3");
|
|
||||||
crate::services::SystemServices::with_mut(|system_services| {
|
|
||||||
system_services
|
|
||||||
.suspend_process(xous_kernel::PID::new(3).unwrap())
|
|
||||||
.unwrap();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
b'c' => {
|
|
||||||
println!(">>>>>>>>>>>>>>>>>>>>>>>>>>>> Continuing (Resuming) PID 3");
|
|
||||||
crate::services::SystemServices::with_mut(|system_services| {
|
|
||||||
system_services
|
|
||||||
.continue_process(xous_kernel::PID::new(3).unwrap())
|
|
||||||
.unwrap();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
b'h' => {
|
b'h' => {
|
||||||
println!("Xous Kernel Debug");
|
println!("Xous Kernel Debug");
|
||||||
|
|
@ -485,8 +274,6 @@ pub fn irq(_irq_number: usize, _arg: *mut usize) {
|
||||||
println!(" p | print all processes");
|
println!(" p | print all processes");
|
||||||
println!(" P | print all processes and threads");
|
println!(" P | print all processes and threads");
|
||||||
println!(" r | report RAM usage of all processes");
|
println!(" r | report RAM usage of all processes");
|
||||||
println!(" s | Suspend PID 3");
|
|
||||||
println!(" c | Continue PID 3");
|
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue