Skip to content

Commit 65ee44c

Browse files
committed
aarch64: improve format log, add comments for clarity, remove dead code
1 parent 914bff3 commit 65ee44c

File tree

2 files changed

+43
-127
lines changed

2 files changed

+43
-127
lines changed

qlib/kernel/SignalDef.rs

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,50 @@ pub struct PtRegs {
112112
#[cfg(target_arch = "aarch64")]
113113
impl fmt::LowerHex for PtRegs {
114114
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
115-
write!(f, "SP:[{:#x}]
115+
write!(f, "\nSP:[{:#x}]
116116
PC:[{:#x}]
117117
State:[{:#x}]
118118
X0:[{:#x}]
119-
GenRegs:[{:#?}]",
120-
self.sp, self.pc, self.pstate,
121-
self.orig_x0, self.regs)
119+
GenRegs:[
120+
x0:{:#x}
121+
x1:{:#x}
122+
x2:{:#x}
123+
x3:{:#x}
124+
x4:{:#x}
125+
x5:{:#x}
126+
x6:{:#x}
127+
x7:{:#x}
128+
x8:{:#x}
129+
x9:{:#x}
130+
x10:{:#x}
131+
x11:{:#x}
132+
x12:{:#x}
133+
x13:{:#x}
134+
x14:{:#x}
135+
x15:{:#x}
136+
x16:{:#x}
137+
x17:{:#x}
138+
x18:{:#x}
139+
x19:{:#x}
140+
x20:{:#x}
141+
x21:{:#x}
142+
x22:{:#x}
143+
x23:{:#x}
144+
x24:{:#x}
145+
x25:{:#x}
146+
x26:{:#x}
147+
x27:{:#x}
148+
x28:{:#x}
149+
x29:{:#x}
150+
x30:{:#x}
151+
]\n",
152+
self.sp, self.pc, self.pstate, self.orig_x0, self.regs[0],
153+
self.regs[1], self.regs[2], self.regs[3], self.regs[4], self.regs[5],
154+
self.regs[6], self.regs[7], self.regs[8], self.regs[9], self.regs[10],
155+
self.regs[11], self.regs[12], self.regs[13], self.regs[14], self.regs[15],
156+
self.regs[16], self.regs[17], self.regs[18], self.regs[19], self.regs[20],
157+
self.regs[21], self.regs[22], self.regs[23], self.regs[24], self.regs[25],
158+
self.regs[26], self.regs[27], self.regs[28], self.regs[29], self.regs[30])
122159
}
123160
}
124161
#[cfg(target_arch = "aarch64")]
@@ -856,7 +893,8 @@ pub struct SignalStruct {
856893
trapStopPending: bool,
857894
}
858895

859-
// https://elixir.bootlin.com/linux/latest/source/arch/x86/include/uapi/asm/signal.h#L132
896+
// Based on linux's 'struct signalstack' in signal.h
897+
// Same for both x86_64 and Arm
860898
#[derive(Debug, Clone, Copy)]
861899
#[repr(C)]
862900
pub struct SignalStack {

qlib/kernel/arch/x86_64/signal.rs

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)