Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
e3b510a4
There was an error fetching the commit references. Please try again later.
Commit
e3b510a4
authored
1 year ago
by
Liam
Browse files
Options
Downloads
Patches
Plain Diff
core: check for thread dpc before eret
parent
247d66a6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/core/arm/arm_interface.cpp
+8
-8
8 additions, 8 deletions
src/core/arm/arm_interface.cpp
with
8 additions
and
8 deletions
src/core/arm/arm_interface.cpp
+
8
−
8
View file @
e3b510a4
...
@@ -153,6 +153,14 @@ void ARM_Interface::Run() {
...
@@ -153,6 +153,14 @@ void ARM_Interface::Run() {
Kernel
::
KThread
*
current_thread
{
Kernel
::
GetCurrentThreadPointer
(
system
.
Kernel
())};
Kernel
::
KThread
*
current_thread
{
Kernel
::
GetCurrentThreadPointer
(
system
.
Kernel
())};
HaltReason
hr
{};
HaltReason
hr
{};
// If the thread is scheduled for termination, exit the thread.
if
(
current_thread
->
HasDpc
())
{
if
(
current_thread
->
IsTerminationRequested
())
{
current_thread
->
Exit
();
UNREACHABLE
();
}
}
// Notify the debugger and go to sleep if a step was performed
// Notify the debugger and go to sleep if a step was performed
// and this thread has been scheduled again.
// and this thread has been scheduled again.
if
(
current_thread
->
GetStepState
()
==
StepState
::
StepPerformed
)
{
if
(
current_thread
->
GetStepState
()
==
StepState
::
StepPerformed
)
{
...
@@ -174,14 +182,6 @@ void ARM_Interface::Run() {
...
@@ -174,14 +182,6 @@ void ARM_Interface::Run() {
}
}
system
.
ExitCPUProfile
();
system
.
ExitCPUProfile
();
// If the thread is scheduled for termination, exit the thread.
if
(
current_thread
->
HasDpc
())
{
if
(
current_thread
->
IsTerminationRequested
())
{
current_thread
->
Exit
();
UNREACHABLE
();
}
}
// Notify the debugger and go to sleep if a breakpoint was hit,
// Notify the debugger and go to sleep if a breakpoint was hit,
// or if the thread is unable to continue for any reason.
// or if the thread is unable to continue for any reason.
if
(
True
(
hr
&
HaltReason
::
InstructionBreakpoint
)
||
True
(
hr
&
HaltReason
::
PrefetchAbort
))
{
if
(
True
(
hr
&
HaltReason
::
InstructionBreakpoint
)
||
True
(
hr
&
HaltReason
::
PrefetchAbort
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment