Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
redox-os
kernel
Commits
0ab4529e
Verified
Commit
0ab4529e
authored
Dec 01, 2021
by
Jeremy Soller
Browse files
Make register dumps lowercase
parent
cd3dcf15
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/arch/x86_64/interrupt/handler.rs
View file @
0ab4529e
...
...
@@ -20,15 +20,15 @@ pub struct ScratchRegisters {
impl
ScratchRegisters
{
pub
fn
dump
(
&
self
)
{
println!
(
"RAX: {:
>
016
X
}"
,
{
self
.rax
});
println!
(
"RCX: {:
>
016
X
}"
,
{
self
.rcx
});
println!
(
"RDX: {:
>
016
X
}"
,
{
self
.rdx
});
println!
(
"RDI: {:
>
016
X
}"
,
{
self
.rdi
});
println!
(
"RSI: {:
>
016
X
}"
,
{
self
.rsi
});
println!
(
"R8: {:
>
016
X
}"
,
{
self
.r8
});
println!
(
"R9: {:
>
016
X
}"
,
{
self
.r9
});
println!
(
"R10: {:
>
016
X
}"
,
{
self
.r10
});
println!
(
"R11: {:
>
016
X
}"
,
{
self
.r11
});
println!
(
"RAX: {:016
x
}"
,
{
self
.rax
});
println!
(
"RCX: {:016
x
}"
,
{
self
.rcx
});
println!
(
"RDX: {:016
x
}"
,
{
self
.rdx
});
println!
(
"RDI: {:016
x
}"
,
{
self
.rdi
});
println!
(
"RSI: {:016
x
}"
,
{
self
.rsi
});
println!
(
"R8: {:016
x
}"
,
{
self
.r8
});
println!
(
"R9: {:016
x
}"
,
{
self
.r9
});
println!
(
"R10: {:016
x
}"
,
{
self
.r10
});
println!
(
"R11: {:016
x
}"
,
{
self
.r11
});
}
}
...
...
@@ -45,12 +45,12 @@ pub struct PreservedRegisters {
impl
PreservedRegisters
{
pub
fn
dump
(
&
self
)
{
println!
(
"RBX: {:
>
016
X
}"
,
{
self
.rbx
});
println!
(
"RBP: {:
>
016
X
}"
,
{
self
.rbp
});
println!
(
"R12: {:
>
016
X
}"
,
{
self
.r12
});
println!
(
"R13: {:
>
016
X
}"
,
{
self
.r13
});
println!
(
"R14: {:
>
016
X
}"
,
{
self
.r14
});
println!
(
"R15: {:
>
016
X
}"
,
{
self
.r15
});
println!
(
"RBX: {:016
x
}"
,
{
self
.rbx
});
println!
(
"RBP: {:016
x
}"
,
{
self
.rbp
});
println!
(
"R12: {:016
x
}"
,
{
self
.r12
});
println!
(
"R13: {:016
x
}"
,
{
self
.r13
});
println!
(
"R14: {:016
x
}"
,
{
self
.r14
});
println!
(
"R15: {:016
x
}"
,
{
self
.r15
});
}
}
...
...
@@ -72,19 +72,19 @@ pub struct IretRegisters {
impl
IretRegisters
{
pub
fn
dump
(
&
self
)
{
println!
(
"RFLAG: {:
>
016
X
}"
,
{
self
.rflags
});
println!
(
"CS: {:
>
016
X
}"
,
{
self
.cs
});
println!
(
"RIP: {:
>
016
X
}"
,
{
self
.rip
});
println!
(
"RFLAG: {:016
x
}"
,
{
self
.rflags
});
println!
(
"CS: {:016
x
}"
,
{
self
.cs
});
println!
(
"RIP: {:016
x
}"
,
{
self
.rip
});
if
self
.cs
&
0b11
!=
0b00
{
println!
(
"RSP: {:
>
016
X
}"
,
{
self
.rsp
});
println!
(
"SS: {:
>
016
X
}"
,
{
self
.ss
});
println!
(
"RSP: {:016
x
}"
,
{
self
.rsp
});
println!
(
"SS: {:016
x
}"
,
{
self
.ss
});
}
unsafe
{
let
fsbase
=
x86
::
msr
::
rdmsr
(
x86
::
msr
::
IA32_FS_BASE
);
let
gsbase
=
x86
::
msr
::
rdmsr
(
x86
::
msr
::
IA32_KERNEL_GSBASE
);
let
kgsbase
=
x86
::
msr
::
rdmsr
(
x86
::
msr
::
IA32_GS_BASE
);
println!
(
"FSBASE {:
>
016
X
}
\n
GSBASE {:016
X
}
\n
KGSBASE {:016
X
}"
,
fsbase
,
gsbase
,
kgsbase
);
println!
(
"FSBASE {:016
x
}
\n
GSBASE {:016
x
}
\n
KGSBASE {:016
x
}"
,
fsbase
,
gsbase
,
kgsbase
);
}
}
}
...
...
@@ -198,7 +198,7 @@ pub struct InterruptErrorStack {
impl
InterruptErrorStack
{
pub
fn
dump
(
&
self
)
{
println!
(
"CODE: {:
>
016
X
}"
,
{
self
.code
});
println!
(
"CODE: {:016
x
}"
,
{
self
.code
});
self
.inner
.dump
();
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment