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
f654a03f
There was an error fetching the commit references. Please try again later.
Commit
f654a03f
authored
10 years ago
by
bunnei
Browse files
Options
Downloads
Patches
Plain Diff
thread: whitespace change - fixed * and & placement
parent
44336329
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/hle/kernel/thread.cpp
+25
-25
25 additions, 25 deletions
src/core/hle/kernel/thread.cpp
src/core/hle/kernel/thread.h
+2
-2
2 additions, 2 deletions
src/core/hle/kernel/thread.h
with
27 additions
and
27 deletions
src/core/hle/kernel/thread.cpp
+
25
−
25
View file @
f654a03f
...
@@ -45,8 +45,8 @@ enum WaitType {
...
@@ -45,8 +45,8 @@ enum WaitType {
class
Thread
:
public
Kernel
::
Object
{
class
Thread
:
public
Kernel
::
Object
{
public:
public:
const
char
*
GetName
()
{
return
name
;
}
const
char
*
GetName
()
{
return
name
;
}
const
char
*
GetTypeName
()
{
return
"Thread"
;
}
const
char
*
GetTypeName
()
{
return
"Thread"
;
}
static
Kernel
::
HandleType
GetStaticHandleType
()
{
return
Kernel
::
HandleType
::
Thread
;
}
static
Kernel
::
HandleType
GetStaticHandleType
()
{
return
Kernel
::
HandleType
::
Thread
;
}
Kernel
::
HandleType
GetHandleType
()
const
{
return
Kernel
::
HandleType
::
Thread
;
}
Kernel
::
HandleType
GetHandleType
()
const
{
return
Kernel
::
HandleType
::
Thread
;
}
...
@@ -85,11 +85,11 @@ Handle g_current_thread_handle;
...
@@ -85,11 +85,11 @@ Handle g_current_thread_handle;
Thread
*
g_current_thread
;
Thread
*
g_current_thread
;
inline
Thread
*
__GetCurrentThread
()
{
inline
Thread
*
__GetCurrentThread
()
{
return
g_current_thread
;
return
g_current_thread
;
}
}
inline
void
__SetCurrentThread
(
Thread
*
t
)
{
inline
void
__SetCurrentThread
(
Thread
*
t
)
{
g_current_thread
=
t
;
g_current_thread
=
t
;
g_current_thread_handle
=
t
->
GetHandle
();
g_current_thread_handle
=
t
->
GetHandle
();
}
}
...
@@ -97,7 +97,7 @@ inline void __SetCurrentThread(Thread *t) {
...
@@ -97,7 +97,7 @@ inline void __SetCurrentThread(Thread *t) {
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
/// Saves the current CPU context
/// Saves the current CPU context
void
__KernelSaveContext
(
ThreadContext
&
ctx
)
{
void
__KernelSaveContext
(
ThreadContext
&
ctx
)
{
ctx
.
cpu_registers
[
0
]
=
Core
::
g_app_core
->
GetReg
(
0
);
ctx
.
cpu_registers
[
0
]
=
Core
::
g_app_core
->
GetReg
(
0
);
ctx
.
cpu_registers
[
1
]
=
Core
::
g_app_core
->
GetReg
(
1
);
ctx
.
cpu_registers
[
1
]
=
Core
::
g_app_core
->
GetReg
(
1
);
ctx
.
cpu_registers
[
2
]
=
Core
::
g_app_core
->
GetReg
(
2
);
ctx
.
cpu_registers
[
2
]
=
Core
::
g_app_core
->
GetReg
(
2
);
...
@@ -118,7 +118,7 @@ void __KernelSaveContext(ThreadContext &ctx) {
...
@@ -118,7 +118,7 @@ void __KernelSaveContext(ThreadContext &ctx) {
}
}
/// Loads a CPU context
/// Loads a CPU context
void
__KernelLoadContext
(
const
ThreadContext
&
ctx
)
{
void
__KernelLoadContext
(
const
ThreadContext
&
ctx
)
{
Core
::
g_app_core
->
SetReg
(
0
,
ctx
.
cpu_registers
[
0
]);
Core
::
g_app_core
->
SetReg
(
0
,
ctx
.
cpu_registers
[
0
]);
Core
::
g_app_core
->
SetReg
(
1
,
ctx
.
cpu_registers
[
1
]);
Core
::
g_app_core
->
SetReg
(
1
,
ctx
.
cpu_registers
[
1
]);
Core
::
g_app_core
->
SetReg
(
2
,
ctx
.
cpu_registers
[
2
]);
Core
::
g_app_core
->
SetReg
(
2
,
ctx
.
cpu_registers
[
2
]);
...
@@ -141,7 +141,7 @@ void __KernelLoadContext(const ThreadContext &ctx) {
...
@@ -141,7 +141,7 @@ void __KernelLoadContext(const ThreadContext &ctx) {
}
}
/// Resets a thread
/// Resets a thread
void
__KernelResetThread
(
Thread
*
t
,
s32
lowest_priority
)
{
void
__KernelResetThread
(
Thread
*
t
,
s32
lowest_priority
)
{
memset
(
&
t
->
context
,
0
,
sizeof
(
ThreadContext
));
memset
(
&
t
->
context
,
0
,
sizeof
(
ThreadContext
));
t
->
context
.
pc
=
t
->
entry_point
;
t
->
context
.
pc
=
t
->
entry_point
;
...
@@ -155,7 +155,7 @@ void __KernelResetThread(Thread *t, s32 lowest_priority) {
...
@@ -155,7 +155,7 @@ void __KernelResetThread(Thread *t, s32 lowest_priority) {
}
}
/// Change a thread to "ready" state
/// Change a thread to "ready" state
void
__KernelChangeReadyState
(
Thread
*
t
,
bool
ready
)
{
void
__KernelChangeReadyState
(
Thread
*
t
,
bool
ready
)
{
Handle
handle
=
t
->
GetHandle
();
Handle
handle
=
t
->
GetHandle
();
if
(
t
->
IsReady
())
{
if
(
t
->
IsReady
())
{
if
(
!
ready
)
{
if
(
!
ready
)
{
...
@@ -172,7 +172,7 @@ void __KernelChangeReadyState(Thread *t, bool ready) {
...
@@ -172,7 +172,7 @@ void __KernelChangeReadyState(Thread *t, bool ready) {
}
}
/// Changes a threads state
/// Changes a threads state
void
__KernelChangeThreadState
(
Thread
*
t
,
ThreadStatus
new_status
)
{
void
__KernelChangeThreadState
(
Thread
*
t
,
ThreadStatus
new_status
)
{
if
(
!
t
||
t
->
status
==
new_status
)
{
if
(
!
t
||
t
->
status
==
new_status
)
{
return
;
return
;
}
}
...
@@ -187,7 +187,7 @@ void __KernelChangeThreadState(Thread *t, ThreadStatus new_status) {
...
@@ -187,7 +187,7 @@ void __KernelChangeThreadState(Thread *t, ThreadStatus new_status) {
}
}
/// Calls a thread by marking it as "ready" (note: will not actually execute until current thread yields)
/// Calls a thread by marking it as "ready" (note: will not actually execute until current thread yields)
void
__KernelCallThread
(
Thread
*
t
)
{
void
__KernelCallThread
(
Thread
*
t
)
{
// Stop waiting
// Stop waiting
if
(
t
->
wait_type
!=
WAITTYPE_NONE
)
{
if
(
t
->
wait_type
!=
WAITTYPE_NONE
)
{
t
->
wait_type
=
WAITTYPE_NONE
;
t
->
wait_type
=
WAITTYPE_NONE
;
...
@@ -196,10 +196,10 @@ void __KernelCallThread(Thread *t) {
...
@@ -196,10 +196,10 @@ void __KernelCallThread(Thread *t) {
}
}
/// Creates a new thread
/// Creates a new thread
Thread
*
__KernelCreateThread
(
Handle
&
handle
,
const
char
*
name
,
u32
entry_point
,
s32
priority
,
Thread
*
__KernelCreateThread
(
Handle
&
handle
,
const
char
*
name
,
u32
entry_point
,
s32
priority
,
s32
processor_id
,
u32
stack_top
,
int
stack_size
)
{
s32
processor_id
,
u32
stack_top
,
int
stack_size
)
{
Thread
*
t
=
new
Thread
;
Thread
*
t
=
new
Thread
;
handle
=
Kernel
::
g_object_pool
.
Create
(
t
);
handle
=
Kernel
::
g_object_pool
.
Create
(
t
);
...
@@ -221,7 +221,7 @@ Thread *__KernelCreateThread(Handle &handle, const char *name, u32 entry_point,
...
@@ -221,7 +221,7 @@ Thread *__KernelCreateThread(Handle &handle, const char *name, u32 entry_point,
}
}
/// Creates a new thread - wrapper for external user
/// Creates a new thread - wrapper for external user
Handle
__KernelCreateThread
(
const
char
*
name
,
u32
entry_point
,
s32
priority
,
s32
processor_id
,
Handle
__KernelCreateThread
(
const
char
*
name
,
u32
entry_point
,
s32
priority
,
s32
processor_id
,
u32
stack_top
,
int
stack_size
)
{
u32
stack_top
,
int
stack_size
)
{
if
(
name
==
NULL
)
{
if
(
name
==
NULL
)
{
ERROR_LOG
(
KERNEL
,
"__KernelCreateThread(): NULL name"
);
ERROR_LOG
(
KERNEL
,
"__KernelCreateThread(): NULL name"
);
...
@@ -245,7 +245,7 @@ Handle __KernelCreateThread(const char *name, u32 entry_point, s32 priority, s32
...
@@ -245,7 +245,7 @@ Handle __KernelCreateThread(const char *name, u32 entry_point, s32 priority, s32
return
-
1
;
return
-
1
;
}
}
Handle
handle
;
Handle
handle
;
Thread
*
t
=
__KernelCreateThread
(
handle
,
name
,
entry_point
,
priority
,
processor_id
,
stack_top
,
Thread
*
t
=
__KernelCreateThread
(
handle
,
name
,
entry_point
,
priority
,
processor_id
,
stack_top
,
stack_size
);
stack_size
);
HLE
::
EatCycles
(
32000
);
HLE
::
EatCycles
(
32000
);
...
@@ -260,8 +260,8 @@ Handle __KernelCreateThread(const char *name, u32 entry_point, s32 priority, s32
...
@@ -260,8 +260,8 @@ Handle __KernelCreateThread(const char *name, u32 entry_point, s32 priority, s32
}
}
/// Switches CPU context to that of the specified thread
/// Switches CPU context to that of the specified thread
void
__KernelSwitchContext
(
Thread
*
t
,
const
char
*
reason
)
{
void
__KernelSwitchContext
(
Thread
*
t
,
const
char
*
reason
)
{
Thread
*
cur
=
__GetCurrentThread
();
Thread
*
cur
=
__GetCurrentThread
();
// Save context for current thread
// Save context for current thread
if
(
cur
)
{
if
(
cur
)
{
...
@@ -284,9 +284,9 @@ void __KernelSwitchContext(Thread* t, const char *reason) {
...
@@ -284,9 +284,9 @@ void __KernelSwitchContext(Thread* t, const char *reason) {
}
}
/// Gets the next thread that is ready to be run by priority
/// Gets the next thread that is ready to be run by priority
Thread
*
__KernelNextThread
()
{
Thread
*
__KernelNextThread
()
{
Handle
next
;
Handle
next
;
Thread
*
cur
=
__GetCurrentThread
();
Thread
*
cur
=
__GetCurrentThread
();
if
(
cur
&&
cur
->
IsRunning
())
{
if
(
cur
&&
cur
->
IsRunning
())
{
next
=
g_thread_ready_queue
.
pop_first_better
(
cur
->
current_priority
);
next
=
g_thread_ready_queue
.
pop_first_better
(
cur
->
current_priority
);
...
@@ -304,13 +304,13 @@ Handle __KernelSetupMainThread(s32 priority, int stack_size) {
...
@@ -304,13 +304,13 @@ Handle __KernelSetupMainThread(s32 priority, int stack_size) {
Handle
handle
;
Handle
handle
;
// Initialize new "main" thread
// Initialize new "main" thread
Thread
*
t
=
__KernelCreateThread
(
handle
,
"main"
,
Core
::
g_app_core
->
GetPC
(),
priority
,
Thread
*
t
=
__KernelCreateThread
(
handle
,
"main"
,
Core
::
g_app_core
->
GetPC
(),
priority
,
THREADPROCESSORID_0
,
Memory
::
SCRATCHPAD_VADDR_END
,
stack_size
);
THREADPROCESSORID_0
,
Memory
::
SCRATCHPAD_VADDR_END
,
stack_size
);
__KernelResetThread
(
t
,
0
);
__KernelResetThread
(
t
,
0
);
// If running another thread already, set it to "ready" state
// If running another thread already, set it to "ready" state
Thread
*
cur
=
__GetCurrentThread
();
Thread
*
cur
=
__GetCurrentThread
();
if
(
cur
&&
cur
->
IsRunning
())
{
if
(
cur
&&
cur
->
IsRunning
())
{
__KernelChangeReadyState
(
cur
,
true
);
__KernelChangeReadyState
(
cur
,
true
);
}
}
...
@@ -326,7 +326,7 @@ Handle __KernelSetupMainThread(s32 priority, int stack_size) {
...
@@ -326,7 +326,7 @@ Handle __KernelSetupMainThread(s32 priority, int stack_size) {
/// Resumes a thread from waiting by marking it as "ready"
/// Resumes a thread from waiting by marking it as "ready"
void
__KernelResumeThreadFromWait
(
Handle
handle
)
{
void
__KernelResumeThreadFromWait
(
Handle
handle
)
{
u32
error
;
u32
error
;
Thread
*
t
=
Kernel
::
g_object_pool
.
Get
<
Thread
>
(
handle
,
error
);
Thread
*
t
=
Kernel
::
g_object_pool
.
Get
<
Thread
>
(
handle
,
error
);
if
(
t
)
{
if
(
t
)
{
t
->
status
&=
~
THREADSTATUS_WAIT
;
t
->
status
&=
~
THREADSTATUS_WAIT
;
if
(
!
(
t
->
status
&
(
THREADSTATUS_WAITSUSPEND
|
THREADSTATUS_DORMANT
|
THREADSTATUS_DEAD
)))
{
if
(
!
(
t
->
status
&
(
THREADSTATUS_WAITSUSPEND
|
THREADSTATUS_DORMANT
|
THREADSTATUS_DEAD
)))
{
...
@@ -336,15 +336,15 @@ void __KernelResumeThreadFromWait(Handle handle) {
...
@@ -336,15 +336,15 @@ void __KernelResumeThreadFromWait(Handle handle) {
}
}
/// Puts a thread in the wait state for the given type/reason
/// Puts a thread in the wait state for the given type/reason
void
__KernelWaitCurThread
(
WaitType
wait_type
,
const
char
*
reason
)
{
void
__KernelWaitCurThread
(
WaitType
wait_type
,
const
char
*
reason
)
{
Thread
*
t
=
__GetCurrentThread
();
Thread
*
t
=
__GetCurrentThread
();
t
->
wait_type
=
wait_type
;
t
->
wait_type
=
wait_type
;
__KernelChangeThreadState
(
t
,
ThreadStatus
(
THREADSTATUS_WAIT
|
(
t
->
status
&
THREADSTATUS_SUSPEND
)));
__KernelChangeThreadState
(
t
,
ThreadStatus
(
THREADSTATUS_WAIT
|
(
t
->
status
&
THREADSTATUS_SUSPEND
)));
}
}
/// Reschedules to the next available thread (call after current thread is suspended)
/// Reschedules to the next available thread (call after current thread is suspended)
void
__KernelReschedule
(
const
char
*
reason
)
{
void
__KernelReschedule
(
const
char
*
reason
)
{
Thread
*
next
=
__KernelNextThread
();
Thread
*
next
=
__KernelNextThread
();
if
(
next
>
0
)
{
if
(
next
>
0
)
{
__KernelSwitchContext
(
next
,
reason
);
__KernelSwitchContext
(
next
,
reason
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/core/hle/kernel/thread.h
+
2
−
2
View file @
f654a03f
...
@@ -22,14 +22,14 @@ enum ThreadProcessorId {
...
@@ -22,14 +22,14 @@ enum ThreadProcessorId {
};
};
/// Creates a new thread - wrapper for external user
/// Creates a new thread - wrapper for external user
Handle
__KernelCreateThread
(
const
char
*
name
,
u32
entry_point
,
s32
priority
,
Handle
__KernelCreateThread
(
const
char
*
name
,
u32
entry_point
,
s32
priority
,
s32
processor_id
,
u32
stack_top
,
int
stack_size
=
Kernel
::
DEFAULT_STACK_SIZE
);
s32
processor_id
,
u32
stack_top
,
int
stack_size
=
Kernel
::
DEFAULT_STACK_SIZE
);
/// Sets up the primary application thread
/// Sets up the primary application thread
Handle
__KernelSetupMainThread
(
s32
priority
,
int
stack_size
=
Kernel
::
DEFAULT_STACK_SIZE
);
Handle
__KernelSetupMainThread
(
s32
priority
,
int
stack_size
=
Kernel
::
DEFAULT_STACK_SIZE
);
/// Reschedules to the next available thread (call after current thread is suspended)
/// Reschedules to the next available thread (call after current thread is suspended)
void
__KernelReschedule
(
const
char
*
reason
);
void
__KernelReschedule
(
const
char
*
reason
);
void
__KernelThreadingInit
();
void
__KernelThreadingInit
();
void
__KernelThreadingShutdown
();
void
__KernelThreadingShutdown
();
...
...
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