/*
- * AcessOS Microkernel Version
+ * Acess2 x86_64 port
* proc.c
*/
#include <acess.h>
// === IMPORTS ===
extern tGDT gGDT[];
-extern void APStartup(); // 16-bit AP startup code
-extern Uint GetRIP(); // start.asm
+extern void APStartup(void); // 16-bit AP startup code
+extern Uint GetRIP(void); // start.asm
extern Uint64 gInitialPML4[512]; // start.asm
extern void gInitialKernelStack;
extern tSpinlock glThreadListLock;
extern tThread *gSleepingThreads;
extern tThread *gDeleteThreads;
extern tThread *Threads_GetNextToRun(int CPU);
-extern void Threads_Dump();
+extern void Threads_Dump(void);
extern tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
-extern void Proc_ReturnToUser();
+extern void Proc_ReturnToUser(void);
+extern int GetCPUNum(void);
// === PROTOTYPES ===
-void ArchThreads_Init();
+void ArchThreads_Init(void);
#if USE_MP
void MP_StartAP(int CPU);
void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode);
#endif
-void Proc_Start();
-tThread *Proc_GetCurThread();
-void Proc_ChangeStack();
+void Proc_Start(void);
+tThread *Proc_GetCurThread(void);
+void Proc_ChangeStack(void);
int Proc_Clone(Uint *Err, Uint Flags);
void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP);
void Proc_CallFaultHandler(tThread *Thread);
-void Proc_Scheduler();
+void Proc_Scheduler(int CPU);
// === GLOBALS ===
// --- Multiprocessing ---
// === CODE ===
/**
- * \fn void ArchThreads_Init()
+ * \fn void ArchThreads_Init(void)
* \brief Starts the process scheduler
*/
-void ArchThreads_Init()
+void ArchThreads_Init(void)
{
Uint pos = 0;
pos = 0;
#endif
gTSSs[pos].RSP0 = 0; // Set properly by scheduler
- gGDT[6+pos*2].BaseLow = ((Uint)(&gTSSs[pos])) & 0xFFFF;
- gGDT[6+pos*2].BaseMid = ((Uint)(&gTSSs[pos])) >> 16;
- gGDT[6+pos*2].BaseHi = ((Uint)(&gTSSs[pos])) >> 24;
- gGDT[6+pos*2+1].DWord[0] = ((Uint)(&gTSSs[pos])) >> 32;
+ gGDT[7+pos*2].LimitLow = sizeof(tTSS) & 0xFFFF;
+ gGDT[7+pos*2].BaseLow = ((Uint)(&gTSSs[pos])) & 0xFFFF;
+ gGDT[7+pos*2].BaseMid = ((Uint)(&gTSSs[pos])) >> 16;
+ gGDT[7+pos*2].BaseHi = ((Uint)(&gTSSs[pos])) >> 24;
+ gGDT[7+pos*2+1].DWord[0] = ((Uint)(&gTSSs[pos])) >> 32;
#if USE_MP
}
for(pos=0;pos<giNumCPUs;pos++) {
#endif
- __asm__ __volatile__ ("ltr %%ax"::"a"(0x30+pos*8));
+ __asm__ __volatile__ ("ltr %%ax"::"a"(0x38+pos*16));
#if USE_MP
}
#endif
#endif
/**
- * \fn void Proc_Start()
+ * \fn void Proc_Start(void)
* \brief Start process scheduler
*/
-void Proc_Start()
+void Proc_Start(void)
{
// Start Interrupts (and hence scheduler)
__asm__ __volatile__("sti");
}
/**
- * \fn tThread *Proc_GetCurThread()
+ * \fn tThread *Proc_GetCurThread(void)
* \brief Gets the current thread
*/
-tThread *Proc_GetCurThread()
+tThread *Proc_GetCurThread(void)
{
#if USE_MP
- return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current;
+ return gaCPUs[ GetCPUNum() ].Current;
#else
return gCurrentThread;
#endif
}
/**
- * \fn void Proc_ChangeStack()
+ * \fn void Proc_ChangeStack(void)
* \brief Swaps the current stack for a new one (in the proper stack reigon)
*/
-void Proc_ChangeStack()
+void Proc_ChangeStack(void)
{
Uint rsp, rbp;
Uint tmp_rbp, old_rsp;
curBase = (Uint)&gInitialKernelStack;
- LOG("curBase = 0x%x, newBase = 0x%x", curBase, newBase);
+ Log("curBase = 0x%x, newBase = 0x%x", curBase, newBase);
// Get ESP as a used size
rsp = curBase - rsp;
- LOG("memcpy( %p, %p, 0x%x )", (void*)(newBase - rsp), (void*)(curBase - rsp), rsp );
+ Log("memcpy( %p, %p, 0x%x )", (void*)(newBase - rsp), (void*)(curBase - rsp), rsp );
// Copy used stack
memcpy( (void*)(newBase - rsp), (void*)(curBase - rsp), rsp );
// Get ESP as an offset in the new stack
// Adjust EBP
rbp = newBase - (curBase - rbp);
+ Log("Update stack");
// Repair EBPs & Stack Addresses
// Catches arguments also, but may trash stack-address-like values
- for(tmp_rbp = rsp; tmp_rbp < newBase; tmp_rbp += 4)
+ for(tmp_rbp = rsp; tmp_rbp < newBase; tmp_rbp += sizeof(Uint))
{
if(old_rsp < *(Uint*)tmp_rbp && *(Uint*)tmp_rbp < curBase)
*(Uint*)tmp_rbp += newBase - curBase;
}
+ Log("Applying Changes");
Proc_GetCurThread()->KernelStack = newBase;
-
__asm__ __volatile__ ("mov %0, %%rsp"::"r"(rsp));
__asm__ __volatile__ ("mov %0, %%rbp"::"r"(rbp));
}
newThread = Threads_CloneTCB(Err, Flags);
if(!newThread) return -1;
+ Log("Proc_Clone: newThread = %p", newThread);
+
// Initialise Memory Space (New Addr space or kernel stack)
if(Flags & CLONE_VM) {
+ Log("Proc_Clone: Cloning VM");
newThread->MemState.CR3 = MM_Clone();
newThread->KernelStack = cur->KernelStack;
} else {
// Create new KStack
newThread->KernelStack = MM_NewKStack();
+ Log("Proc_Clone: newKStack = %p", newThread->KernelStack);
// Check for errors
if(newThread->KernelStack == 0) {
free(newThread);
// Repair EBPs & Stack Addresses
// Catches arguments also, but may trash stack-address-like values
- for(tmp_rbp = rsp; tmp_rbp < newThread->KernelStack; tmp_rbp += 4)
+ for(tmp_rbp = rsp; tmp_rbp < newThread->KernelStack; tmp_rbp += sizeof(Uint))
{
if(old_rsp < *(Uint*)tmp_rbp && *(Uint*)tmp_rbp < cur->KernelStack)
*(Uint*)tmp_rbp += newThread->KernelStack - cur->KernelStack;
}
/**
- * \fn int Proc_SpawnWorker()
+ * \fn int Proc_SpawnWorker(void)
* \brief Spawns a new worker thread
*/
-int Proc_SpawnWorker()
+int Proc_SpawnWorker(void)
{
tThread *new, *cur;
Uint rip, rsp, rbp;
}
/**
- * \fn Uint Proc_MakeUserStack()
+ * \fn Uint Proc_MakeUserStack(void)
* \brief Creates a new user stack
*/
-Uint Proc_MakeUserStack()
+Uint Proc_MakeUserStack(void)
{
int i;
Uint base = USER_STACK_TOP - USER_STACK_SZ;
*/
int Proc_Demote(Uint *Err, int Dest, tRegs *Regs)
{
- int cpl = Regs->cs & 3;
+ int cpl = Regs->CS & 3;
// Sanity Check
if(Dest > 3 || Dest < 0) {
*Err = -EINVAL;
}
// Change the Segment Registers
- Regs->cs = (((Dest+1)<<4) | Dest) - 8;
- Regs->ss = ((Dest+1)<<4) | Dest;
+ Regs->CS = (((Dest+1)<<4) | Dest) - 8;
+ Regs->SS = ((Dest+1)<<4) | Dest;
return 0;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au