/* src/vm/jit/i386/freebsd/md-os.c - machine dependent i386 FreeBSD functions
- Copyright (C) 1996-2005 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 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
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Christian Thalinger
Changes:
- $Id: md-os.c 2972 2005-07-10 15:52:16Z twisti $
-
*/
+#include "config.h"
+
#include <ucontext.h>
-#include "config.h"
#include "vm/jit/i386/md-abi.h"
#include "vm/exceptions.h"
-#include "vm/stringlocal.h"
+#include "vm/signallocal.h"
#include "vm/jit/asmpart.h"
+#include "vm/jit/stacktrace.h"
-/* signal_handler_sigsegv ******************************************************
+/* md_signal_handler_sigsegv ***************************************************
- NullPointerException signal handler for hardware null pointer check.
+ NullPointerException signal handler for hardware null pointer
+ check.
*******************************************************************************/
-void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
+void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
{
- ucontext_t *_uc;
- mcontext_t *_mc;
- stackframeinfo *sfi;
- u1 *sp;
- functionptr ra;
+ ucontext_t *_uc;
+ mcontext_t *_mc;
+ u1 *sp;
+ u1 *ra;
+ u1 *xpc;
_uc = (ucontext_t *) _p;
_mc = &_uc->uc_mcontext;
- /* allocate stackframeinfo on heap */
-
- sfi = NEW(stackframeinfo);
-
- /* create exception */
-
- sp = (u1 *) _mc->mc_esp;
- ra = (functionptr) _mc->mc_eip;
-
- stacktrace_create_inline_stackframeinfo(sfi, NULL, sp, ra);
+ sp = (u1 *) _mc->mc_esp;
+ xpc = (u1 *) _mc->mc_eip;
+ ra = xpc; /* return address is equal to xpc */
- _mc->mc_eax = (ptrint) new_nullpointerexception();
+ _mc->mc_eax =
+ (ptrint) stacktrace_hardware_nullpointerexception(NULL, sp, ra, xpc);
- stacktrace_remove_stackframeinfo(sfi);
-
- FREE(sfi, stackframeinfo);
-
- _mc->mc_ecx = _mc->mc_eip; /* REG_ITMP2_XPC */
+ _mc->mc_ecx = (ptrint) xpc; /* REG_ITMP2_XPC */
_mc->mc_eip = (ptrint) asm_handle_exception;
}
-/* signal_handler_sigfpe *******************************************************
+/* md_signal_handler_sigfpe ****************************************************
- ArithmeticException signal handler for hardware divide by zero check.
+ ArithmeticException signal handler for hardware divide by zero
+ check.
*******************************************************************************/
-void signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
+void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
{
- ucontext_t *_uc;
- mcontext_t *_mc;
- stackframeinfo *sfi;
- u1 *sp;
- functionptr ra;
+ ucontext_t *_uc;
+ mcontext_t *_mc;
+ u1 *sp;
+ u1 *ra;
+ u1 *xpc;
_uc = (ucontext_t *) _p;
_mc = &_uc->uc_mcontext;
- /* allocate stackframeinfo on heap */
-
- sfi = NEW(stackframeinfo);
-
- /* create exception */
+ sp = (u1 *) _mc->mc_esp;
+ xpc = (u1 *) _mc->mc_eip;
+ ra = xpc; /* return address is equal to xpc */
- sp = (u1 *) _mc->mc_esp;
- ra = (functionptr) _mc->mc_eip;
-
- stacktrace_create_inline_stackframeinfo(sfi, NULL, sp, ra);
-
- _mc->mc_eax = (ptrint) new_arithmeticexception();
+ _mc->mc_eax =
+ (ptrint) stacktrace_hardware_arithmeticexception(NULL, sp, ra, xpc);
- stacktrace_remove_stackframeinfo(sfi);
-
- FREE(sfi, stackframeinfo);
-
- _mc->mc_ecx = _mc->mc_eip; /* REG_ITMP2_XPC */
+ _mc->mc_ecx = (ptrint) xpc; /* REG_ITMP2_XPC */
_mc->mc_eip = (ptrint) asm_handle_exception;
}
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
void thread_restartcriticalsection(ucontext_t *uc)
{
void *critical;
- critical = thread_checkcritical((void *) uc->uc_mcontext.mc_eip);
+ critical = critical_find_restart_point((void *) uc->uc_mcontext.mc_eip);
if (critical)
uc->uc_mcontext.mc_eip = (ptrint) critical;