#include <kern/time.h>
#include <kern/thread.h>
#include <kern/mem.h>
+#include <kern/process.h>
+#include <kern/orb.h>
#include <arch/addrs.h>
#include <arch/multiboot.h>
+#include <arch/regs.h>
extern u32 x86_init_ptbl_l2[1024];
+struct X86ExTable {
+ ulong faultaddr, handler;
+};
+
+extern X86ExTable extable_start, extable_end;
+
struct X86InitStack {
u8 stack[4096 - ::Threads::thread_size];
::Threads::Thread thread;
namespace Priv {
void set_idt();
- void show_regs(u32 *stack) {
+ void show_regs(Regs *regs)
+ {
+ u32 esp = regs->cs & 3 ? regs->user_esp :
+ (u32)regs + (u32)sizeof(regs);
+
printf("eax: 0x%08x ecx: 0x%08x edx: 0x%08x ebx: 0x%08x\n"
"esp: 0x%08x ebp: 0x%08x esi: 0x%08x edi: 0x%08x\n"
- "eflags: 0x%08x\n",
- stack[0],
- stack[1],
- stack[2],
- stack[3],
- stack[9] & 3 ? stack[11] : (u32)stack + 11 * 4,
- stack[5],
- stack[6],
- stack[7],
- stack[10]);
-
+ "eflags: 0x%08x ds: %04x es: %04x ss: %04x\n",
+ regs->eax, regs->ecx, regs->edx, regs->ebx, esp,
+ regs->ebp, regs->esi, regs->edi, regs->eflags,
+ regs->ds, regs->es, regs->cs & 3 ? regs->user_ss : regs->ds);
+
printf("Stack trace: ");
- u32 *frame = (u32 *)stack[5];
+ u32 *frame = (u32 *)regs->ebp;
for (int i = 2; i < 32; i++) {
- u32 stackptr = frame[1];
- frame = (u32 *)frame[0];
-
if ((u32)frame < 0x80000000UL)
break;
+ u32 stackptr = frame[1];
+ frame = (u32 *)frame[0];
+
if (!(i % 7))
printf("\n");
printf("0x%08x ", stackptr);
}
+
+ printf("\nStack dump: ");
+
+ for (int i = 2; i < 32; i++) {
+ if (!(i % 7))
+ printf("\n");
+
+ printf("0x%08x ", ((u32 *)esp)[i-2]);
+ }
+
}
struct TimerInt : public IRQ::Interrupt {
};
TimerInt timer_int;
+
+ bool check_extable(Regs *regs, int cause)
+ {
+ X86ExTable *ext;
+ assert((regs->cs & 3) == 0);
+
+ for (ext = &extable_start; ext < &extable_end; ext++) {
+ if (ext->faultaddr == regs->eip) {
+ regs->eip = ext->handler;
+ regs->edx = cause;
+ return true;
+ }
+ }
+
+ return false;
+ }
}
using IRQ::i8259;
Priv::tss.ss0 = 8;
asm volatile("ltr %w0" : : "r" (0x18) : "memory");
- init_thread->addr_space = new Mem::ProcAddrSpace(x86_init_ptbl_l2);
- init_thread->active_addr_space = init_thread->addr_space;
+ init_thread->aspace = new Mem::ProcAddrSpace(x86_init_ptbl_l2);
+ init_thread->active_aspace = init_thread->aspace;
}
void timer_init()
IRQ::InterruptSlot *timer = i8259.get_slot(0);
i8259.request_int(timer, &Priv::timer_int);
}
-
- void ArchThread::init(void *entry, void *arg)
- {
- void **stack = reinterpret_cast<void **>(this);
-
- *--stack = arg;
- *--stack = entry;
-
- esp = stack;
- ebp = 0;
- jump_to_init = 1;
- }
}
using Arch::Priv::show_regs;
+using Arch::Priv::Regs;
-extern "C" void x86_do_diverr(u32 *stack)
+extern "C" void x86_do_diverr(Regs *regs)
{
- printf("Division error at 0x%04x:0x%08x\n", stack[9], stack[8]);
- show_regs(stack);
+ printf("Division error at 0x%04x:0x%08x\n", regs->cs, regs->eip);
+ show_regs(regs);
for(;;);
}
-extern "C" void x86_do_debug(u32 *stack)
+extern "C" void x86_do_debug(Regs *regs)
{
- printf("Debug exception at 0x%04x:0x%08x\n", stack[9], stack[8]);
- show_regs(stack);
+ printf("Debug exception at 0x%04x:0x%08x\n", regs->cs, regs->eip);
+ show_regs(regs);
for(;;);
}
-extern "C" void x86_do_breakpoint(u32 *stack)
+extern "C" void x86_do_breakpoint(Regs *regs)
{
- printf("Breakpoint at 0x%04x:0x%08x\n", stack[9], stack[8]);
- show_regs(stack);
+ printf("Breakpoint at 0x%04x:0x%08x\n", regs->cs, regs->eip);
+ show_regs(regs);
for(;;);
}
-extern "C" void x86_do_invalid_insn(u32 *stack)
+extern "C" void x86_do_invalid_insn(Regs *regs)
{
- printf("Invalid instruction at 0x%04x:0x%08x\n", stack[9], stack[8]);
- show_regs(stack);
+ printf("Invalid instruction at 0x%04x:0x%08x\n", regs->cs, regs->eip);
+ show_regs(regs);
for(;;);
}
-extern "C" void x86_do_page_fault(u32 *stack, u32 fault_addr, u32 error_code)
+extern "C" void x86_do_page_fault(Regs *regs, u32 fault_addr, u32 error_code)
{
Mem::AddrSpace *as;
+ int cause;
if (in_fault)
for(;;);
// accomplish much other than decreasing the odds that the fault message
// gets out.
- if (!(stack[10] & 0x200))
+ if (!(regs->eflags & 0x200))
goto bad_fault;
// Don't allow fault-ins using a borrowed addr-space.
- as = curthread->addr_space;
+ as = curthread->aspace;
if (!as || curthread == Arch::init_thread)
goto bad_fault;
ll_ints_on();
// FIXME: no-exec
- if (as->handle_fault(fault_addr, error_code & 2,
- false /* error_code & 16 */, error_code & 4))
+ cause = as->handle_fault(fault_addr, error_code & 2,
+ false /* error_code & 16 */,
+ error_code & 4);
+
+ if (cause < 0)
+ return;
+
+ if (!(error_code & 4) && check_extable(regs, cause))
return;
// FIXME: throw exception to user
in_fault++;
printf("Page fault at 0x%04x:0x%08x for 0x%08x, error code: 0x%04x\n",
- stack[9], stack[8], fault_addr, error_code);
+ regs->cs, regs->eip, fault_addr, error_code);
- show_regs(stack);
+ show_regs(regs);
for(;;);
}
-extern "C" void x86_do_gpf(u32 *stack, u32 error_code)
+extern "C" void x86_do_gpf(Regs *regs, u32 error_code)
{
if (in_fault)
for(;;);
in_fault++;
printf("General protection fault at 0x%04x:0x%08x, error code: 0x%04x\n",
- stack[9], stack[8], error_code);
+ regs->cs, regs->eip, error_code);
- show_regs(stack);
+ show_regs(regs);
for(;;);
}
{
IRQ::i8259.handle_irq(irq - 0x20);
}
+
+namespace Arch {
+namespace Priv {
+ struct OrbRegs {
+ u32 ds, es;
+
+ union {
+ System::RunTime::ParamInfoBlock *pib;
+ ulong exptr;
+ };
+
+ union {
+ ulong caller;
+ ulong exlen;
+ };
+
+ ulong eip, cs, eflags, user_esp, user_ss;
+ };
+}}
+
+extern "C" void x86_invoke_method(Arch::Priv::OrbRegs *regs)
+{
+ assert(regs->cs & 3);
+ printf("x86_invoke_method %p\n", regs->pib);
+
+ try {
+ ORB::invoke_method(regs->pib, regs->user_esp);
+ }
+
+ catch (SystemException &se) {
+ // Copy exception to user
+ // If an exception is thrown during dispatch, it must be
+ // with the caller's address space, and user_esp must be
+ // the caller's.
+
+ printf("sys exception\n");
+
+ typedef System::Exceptions::NativeCodeExceptionOriginInfo OriginInfo;
+ OriginInfo *oi = OriginInfo::downcast(se.origin);
+
+ if (oi)
+ printf("PC %llx\n", oi->pc);
+ }
+
+ catch (...) {
+ printf("other exception\n");
+ }
+}
+
+extern "C" void x86_return_from_method(Arch::Priv::OrbRegs *regs)
+{
+ assert(regs->cs & 3);
+ regs->user_esp = ORB::return_from_method(regs->exptr, regs->exlen);
+}
projects / polintos / scott / priv.git / blobdiff