git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Changed MM_GetPhysAddr to take a pointer
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86
/
proc.c
diff --git
a/KernelLand/Kernel/arch/x86/proc.c
b/KernelLand/Kernel/arch/x86/proc.c
index
281b628
..
de0d5c3
100644
(file)
--- a/
KernelLand/Kernel/arch/x86/proc.c
+++ b/
KernelLand/Kernel/arch/x86/proc.c
@@
-467,7
+467,6
@@
void Proc_IdleThread(void *Ptr)
*/
void Proc_Start(void)
{
*/
void Proc_Start(void)
{
- int tid;
#if USE_MP
int i;
#endif
#if USE_MP
int i;
#endif
@@
-479,7
+478,7
@@
void Proc_Start(void)
if(i) gaCPUs[i].Current = NULL;
// Create Idle Task
if(i) gaCPUs[i].Current = NULL;
// Create Idle Task
-
tid =
Proc_NewKThread(Proc_IdleThread, &gaCPUs[i]);
+ Proc_NewKThread(Proc_IdleThread, &gaCPUs[i]);
// Start the AP
if( i != giProc_BootProcessorID ) {
// Start the AP
if( i != giProc_BootProcessorID ) {
@@
-496,8
+495,7
@@
void Proc_Start(void)
while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt");
#else
// Create Idle Task
while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt");
#else
// Create Idle Task
- tid = Proc_NewKThread(Proc_IdleThread, &gaCPUs[0]);
-// gaCPUs[0].IdleThread = Threads_GetThread(tid);
+ Proc_NewKThread(Proc_IdleThread, &gaCPUs[0]);
// Set current task
gaCPUs[0].Current = &gThreadZero;
// Set current task
gaCPUs[0].Current = &gThreadZero;
@@
-588,9
+586,8
@@
void Proc_ClearThread(tThread *Thread)
tTID Proc_NewKThread(void (*Fcn)(void*), void *Data)
{
Uint esp;
tTID Proc_NewKThread(void (*Fcn)(void*), void *Data)
{
Uint esp;
- tThread *newThread
, *cur
;
+ tThread *newThread;
- cur = Proc_GetCurThread();
newThread = Threads_CloneTCB(0);
if(!newThread) return -1;
newThread = Threads_CloneTCB(0);
if(!newThread) return -1;
@@
-711,7
+708,7
@@
Uint Proc_MakeUserStack(void)
// Check Prospective Space
for( i = USER_STACK_SZ >> 12; i--; )
// Check Prospective Space
for( i = USER_STACK_SZ >> 12; i--; )
- if( MM_GetPhysAddr(
base + (i<<12
) ) != 0 )
+ if( MM_GetPhysAddr(
(void*)(base + (i<<12)
) ) != 0 )
break;
if(i != -1) return 0;
break;
if(i != -1) return 0;
@@
-863,6
+860,10
@@
void Proc_DumpThreadCPUState(tThread *Thread)
__asm__ __volatile__ ("mov %%ebp, %0" : "=r" (stack));
while( maxBacktraceDistance -- )
{
__asm__ __volatile__ ("mov %%ebp, %0" : "=r" (stack));
while( maxBacktraceDistance -- )
{
+ if( !CheckMem(stack, 8) ) {
+ regs = NULL;
+ break;
+ }
// [ebp] = oldEbp
// [ebp+4] = retaddr
// [ebp] = oldEbp
// [ebp+4] = retaddr
UCC
git Repository :: git.ucc.asn.au