* src/vm/jit/jit.c [ENABLE_PYTHON]: Changed name of hardcoded script.

[cacao.git] / src / vm / signal.c

diff --git a/src/vm/signal.c b/src/vm/signal.c
index 804922fbcfdc141c542830810ab98972a8da1c5f..5d32fb4db306c67be5627028976740ccd0451d9d 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -147,7 +147,7 @@ bool signal_init(void)
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
-#  if defined(__ARM__) || defined(__I386__) || defined(__S390__) || defined(__X86_64__)
+#  if defined(__ARM__) || defined(__I386__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
                /* XXX use better defines for that (in arch.h) */
                /* SIGILL handler */
 
@@ -230,11 +230,16 @@ void signal_register_signal(int signum, functionptr handler, int flags)
 void *signal_handle(int type, intptr_t val,
                                        void *pv, void *sp, void *ra, void *xpc, void *context)
 {
-       stackframeinfo  sfi;
-       int32_t         index;
-       java_handle_t  *o;
-       methodinfo     *m;
-       java_handle_t  *p;
+       stackframeinfo_t  sfi;
+       int32_t           index;
+       java_handle_t    *o;
+       methodinfo       *m;
+       java_handle_t    *p;
+
+       /* Prevent compiler warnings. */
+
+       o = NULL;
+       m = NULL;
 
        /* wrap the value into a handle if it is a reference */
        /* BEFORE: creating stackframeinfo */
@@ -247,7 +252,7 @@ void *signal_handle(int type, intptr_t val,
        case EXCEPTION_HARDWARE_COMPILER:
                /* In this case the passed PV points to the compiler stub.  We
                   get the methodinfo pointer here and set PV to NULL so
-                  stacktrace_stackframeinfo_create determines the PV for the
+                  stacktrace_stackframeinfo_add determines the PV for the
                   parent Java method. */
 
                m  = code_get_methodinfo_for_pv(pv);
@@ -259,9 +264,9 @@ void *signal_handle(int type, intptr_t val,
                break;
        }
 
-       /* create stackframeinfo */
+       /* Fill and add a stackframeinfo. */
 
-       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
+       stacktrace_stackframeinfo_add(&sfi, pv, sp, ra, xpc);
 
        switch (type) {
        case EXCEPTION_HARDWARE_NULLPOINTER:
@@ -330,9 +335,9 @@ void *signal_handle(int type, intptr_t val,
                p = NULL;
        }
 
-       /* remove stackframeinfo */
+       /* Remove stackframeinfo. */
 
-       stacktrace_remove_stackframeinfo(&sfi);
+       stacktrace_stackframeinfo_remove(&sfi);
 
        /* unwrap and return the exception object */
        /* AFTER: removing stackframeinfo */