X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvm%2Fjit%2Fi386%2Flinux%2Fmd-os.c;h=0e7d70d7b11dad5f045a1b7903a4559f21992aee;hb=1787f50fc410d11520f96e8760199f7a94e0f8dc;hp=7e7e0abdc3909f09992117b6a8b9ed2388e13a3b;hpb=aac14705e4353ae6db5afb26575830d3e5ca40ec;p=cacao.git diff --git a/src/vm/jit/i386/linux/md-os.c b/src/vm/jit/i386/linux/md-os.c index 7e7e0abdc..0e7d70d7b 100644 --- a/src/vm/jit/i386/linux/md-os.c +++ b/src/vm/jit/i386/linux/md-os.c @@ -1,9 +1,7 @@ /* src/vm/jit/i386/linux/md-os.c - machine dependent i386 Linux functions - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -35,15 +33,18 @@ #include "vm/types.h" #include "vm/jit/i386/codegen.h" +#include "vm/jit/i386/md.h" -#include "threads/threads-common.h" +#include "threads/thread.h" -#include "vm/exceptions.h" +#include "vm/builtin.h" #include "vm/signallocal.h" #include "vm/stringlocal.h" #include "vm/jit/asmpart.h" +#include "vm/jit/executionstate.h" #include "vm/jit/stacktrace.h" +#include "vm/jit/trap.h" /* md_signal_handler_sigsegv *************************************************** @@ -54,7 +55,6 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p) { - stackframeinfo sfi; ucontext_t *_uc; mcontext_t *_mc; u1 *pv; @@ -69,6 +69,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p) ptrint val; s4 type; void *p; + java_object_t *o; _uc = (ucontext_t *) _p; _mc = &_uc->uc_mcontext; @@ -102,31 +103,64 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p) here. */ val = _mc->gregs[REG_EAX - d]; + + if (type == TRAP_COMPILER) { + /* The PV from the compiler stub is equal to the XPC. */ + + pv = xpc; + + /* We use a framesize of zero here because the call pushed + the return addres onto the stack. */ + + ra = md_stacktrace_get_returnaddress(sp, 0); + + /* Skip the RA on the stack. */ + + sp = sp + 1 * SIZEOF_VOID_P; + + /* The XPC is the RA minus 2, because the RA points to the + instruction after the call. */ + + xpc = ra - 2; + } } else { /* this was a normal NPE */ - type = EXCEPTION_HARDWARE_NULLPOINTER; + type = TRAP_NullPointerException; val = 0; } - /* create stackframeinfo */ - - stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc); - - /* Handle the type. */ + /* Handle the trap. */ - p = signal_handle(xpc, type, val); + p = trap_handle(type, val, pv, sp, ra, xpc, _p); - /* remove stackframeinfo */ + /* Set registers. */ - stacktrace_remove_stackframeinfo(&sfi); + if (type == TRAP_COMPILER) { + if (p == NULL) { + o = builtin_retrieve_exception(); - /* set registers */ + _mc->gregs[REG_ESP] = (uintptr_t) sp; /* Remove RA from stack. */ - _mc->gregs[REG_EAX] = (intptr_t) p; - _mc->gregs[REG_ECX] = (intptr_t) xpc; /* REG_ITMP2_XPC */ - _mc->gregs[REG_EIP] = (intptr_t) asm_handle_exception; + _mc->gregs[REG_EAX] = (uintptr_t) o; + _mc->gregs[REG_ECX] = (uintptr_t) xpc; /* REG_ITMP2_XPC */ + _mc->gregs[REG_EIP] = (uintptr_t) asm_handle_exception; + } + else { + _mc->gregs[REG_EIP] = (uintptr_t) p; + } + } +#if defined(ENABLE_REPLACEMENT) + else if (type == TRAP_COUNTDOWN) { + /* context has been written by md_replace_executionstate_write */ + } +#endif + else { + _mc->gregs[REG_EAX] = (uintptr_t) p; + _mc->gregs[REG_ECX] = (uintptr_t) xpc; /* REG_ITMP2_XPC */ + _mc->gregs[REG_EIP] = (uintptr_t) asm_handle_exception; + } } @@ -139,7 +173,6 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p) void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p) { - stackframeinfo sfi; ucontext_t *_uc; mcontext_t *_mc; u1 *pv; @@ -158,56 +191,23 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p) xpc = (u1 *) _mc->gregs[REG_EIP]; ra = xpc; /* return address is equal to xpc */ - /* this is an ArithmeticException */ + /* This is an ArithmeticException. */ - type = EXCEPTION_HARDWARE_ARITHMETIC; + type = TRAP_ArithmeticException; val = 0; - /* create stackframeinfo */ - - stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc); - - /* Handle the type. */ + /* Handle the trap. */ - p = signal_handle(xpc, type, val); + p = trap_handle(type, val, pv, sp, ra, xpc, _p); - /* remove stackframeinfo */ + /* Set registers. */ - stacktrace_remove_stackframeinfo(&sfi); - - _mc->gregs[REG_EAX] = (intptr_t) p; - _mc->gregs[REG_ECX] = (intptr_t) xpc; /* REG_ITMP2_XPC */ - _mc->gregs[REG_EIP] = (intptr_t) asm_handle_exception; + _mc->gregs[REG_EAX] = (uintptr_t) p; + _mc->gregs[REG_ECX] = (uintptr_t) xpc; /* REG_ITMP2_XPC */ + _mc->gregs[REG_EIP] = (uintptr_t) asm_handle_exception; } -/* md_signal_handler_sigusr1 *************************************************** - - Signal handler for suspending threads. - -*******************************************************************************/ - -#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO) -void md_signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p) -{ - ucontext_t *_uc; - mcontext_t *_mc; - u1 *pc; - u1 *sp; - - _uc = (ucontext_t *) _p; - _mc = &_uc->uc_mcontext; - - /* get the PC and SP for this thread */ - pc = (u1 *) _mc->gregs[REG_EIP]; - sp = (u1 *) _mc->gregs[REG_ESP]; - - /* now suspend the current thread */ - threads_suspend_ack(pc, sp); -} -#endif - - /* md_signal_handler_sigill **************************************************** Signal handler for hardware patcher traps (ud2). @@ -216,7 +216,6 @@ void md_signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p) void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p) { - stackframeinfo sfi; ucontext_t *_uc; mcontext_t *_mc; u1 *pv; @@ -235,31 +234,48 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p) xpc = (u1 *) _mc->gregs[REG_EIP]; ra = xpc; /* return address is equal to xpc */ - /* this is an ArithmeticException */ - - type = EXCEPTION_HARDWARE_PATCHER; + type = TRAP_PATCHER; val = 0; - /* create stackframeinfo */ + /* Handle the trap. */ + + p = trap_handle(type, val, pv, sp, ra, xpc, _p); + + /* Set registers. */ + + if (p != NULL) { + _mc->gregs[REG_EAX] = (uintptr_t) p; + _mc->gregs[REG_ECX] = (uintptr_t) xpc; /* REG_ITMP2_XPC */ + _mc->gregs[REG_EIP] = (uintptr_t) asm_handle_exception; + } +} + - stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc); +/* md_signal_handler_sigusr1 *************************************************** - /* generate appropriate exception */ + Signal handler for suspending threads. - p = signal_handle(xpc, type, val); +*******************************************************************************/ - /* remove stackframeinfo */ +#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO) +void md_signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p) +{ + ucontext_t *_uc; + mcontext_t *_mc; + u1 *pc; + u1 *sp; - stacktrace_remove_stackframeinfo(&sfi); + _uc = (ucontext_t *) _p; + _mc = &_uc->uc_mcontext; - /* set registers (only if exception object ready) */ + /* get the PC and SP for this thread */ + pc = (u1 *) _mc->gregs[REG_EIP]; + sp = (u1 *) _mc->gregs[REG_ESP]; - if (p != NULL) { - _mc->gregs[REG_EAX] = (ptrint) p; - _mc->gregs[REG_ECX] = (ptrint) xpc; /* REG_ITMP2_XPC */ - _mc->gregs[REG_EIP] = (ptrint) asm_handle_exception; - } + /* now suspend the current thread */ + threads_suspend_ack(pc, sp); } +#endif /* md_signal_handler_sigusr2 *************************************************** @@ -288,6 +304,61 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p) #endif +/* md_executionstate_read ****************************************************** + + Read the given context into an executionstate for Replacement. + +*******************************************************************************/ + +void md_executionstate_read(executionstate_t *es, void *context) +{ + ucontext_t *_uc; + mcontext_t *_mc; + s4 i; + + _uc = (ucontext_t *) context; + _mc = &_uc->uc_mcontext; + + /* read special registers */ + es->pc = (u1 *) _mc->gregs[REG_EIP]; + es->sp = (u1 *) _mc->gregs[REG_ESP]; + es->pv = NULL; /* pv must be looked up via AVL tree */ + + /* read integer registers */ + for (i = 0; i < INT_REG_CNT; i++) + es->intregs[i] = _mc->gregs[REG_EAX - i]; + + /* read float registers */ + for (i = 0; i < FLT_REG_CNT; i++) + es->fltregs[i] = 0xdeadbeefdeadbeefULL; +} + + +/* md_executionstate_write ***************************************************** + + Write the given executionstate back to the context for Replacement. + +*******************************************************************************/ + +void md_executionstate_write(executionstate_t *es, void *context) +{ + ucontext_t *_uc; + mcontext_t *_mc; + s4 i; + + _uc = (ucontext_t *) context; + _mc = &_uc->uc_mcontext; + + /* write integer registers */ + for (i = 0; i < INT_REG_CNT; i++) + _mc->gregs[REG_EAX - i] = es->intregs[i]; + + /* write special registers */ + _mc->gregs[REG_EIP] = (ptrint) es->pc; + _mc->gregs[REG_ESP] = (ptrint) es->sp; +} + + /* md_critical_section_restart ************************************************* Search the critical sections tree for a matching section and set