OSDN Git Service

2010-05-27 Kai Tietz <kai.tietz@onevision.com>
[pf3gnuchains/gcc-fork.git] / libjava / interpret.cc
index ac23b06..3f690d7 100644 (file)
@@ -40,12 +40,8 @@ details.  */
 #include <jvmti.h>
 #include "jvmti-int.h"
 
-#include <gnu/classpath/jdwp/Jdwp.h>
 #include <gnu/gcj/jvmti/Breakpoint.h>
 #include <gnu/gcj/jvmti/BreakpointManager.h>
-#include <gnu/gcj/jvmti/ExceptionEvent.h>
-
-#ifdef INTERPRETER
 
 // Execution engine for interpreted code.
 _Jv_InterpreterEngine _Jv_soleInterpreterEngine;
@@ -66,16 +62,31 @@ static void throw_class_format_error (jstring msg)
 static void throw_class_format_error (const char *msg)
        __attribute__ ((__noreturn__));
 
+static void find_catch_location (jthrowable, jthread, jmethodID *, jlong *);
+
+// A macro to facilitate JVMTI exception reporting
+#define REPORT_EXCEPTION(Jthrowable)                   \
+  do {                                                 \
+    if (JVMTI_REQUESTED_EVENT (Exception))             \
+      _Jv_ReportJVMTIExceptionThrow (Jthrowable);      \
+  }                                                    \
+  while (0)
+
 #ifdef DIRECT_THREADED
 // Lock to ensure that methods are not compiled concurrently.
 // We could use a finer-grained lock here, however it is not safe to use
 // the Class monitor as user code in another thread could hold it.
 static _Jv_Mutex_t compile_mutex;
 
+// See class ThreadCountAdjuster and REWRITE_INSN for how this is
+// used.
+_Jv_Mutex_t _Jv_InterpMethod::rewrite_insn_mutex;
+
 void
 _Jv_InitInterpreter()
 {
   _Jv_MutexInit (&compile_mutex);
+  _Jv_MutexInit (&_Jv_InterpMethod::rewrite_insn_mutex);
 }
 #else
 void _Jv_InitInterpreter() {}
@@ -172,60 +183,81 @@ convert (FROM val, TO min, TO max)
 # define LOADD(I)  LOADL(I)
 #endif
 
-#define STOREA(I)               \
-  do {                          \
-    DEBUG_LOCALS_INSN (I, 'o'); \
-    locals[I].o = (--sp)->o;    \
-  } while (0)
-#define STOREI(I)               \
-  do {                          \
-    DEBUG_LOCALS_INSN (I, 'i'); \
-    locals[I].i = (--sp)->i;    \
-  } while (0)
-#define STOREF(I)               \
-  do {                          \
-    DEBUG_LOCALS_INSN (I, 'f'); \
-    locals[I].f = (--sp)->f;    \
+#define STOREA(I)                      \
+  do                                   \
+    {                                  \
+      jint __idx = (I);                        \
+      DEBUG_LOCALS_INSN (__idx, 'o');  \
+      locals[__idx].o = (--sp)->o;     \
+    }                                  \
+  while (0)
+#define STOREI(I)                      \
+  do                                   \
+    {                                  \
+      jint __idx = (I);                        \
+      DEBUG_LOCALS_INSN (__idx, 'i');  \
+      locals[__idx].i = (--sp)->i;     \
   } while (0)
+#define STOREF(I)                      \
+  do                                   \
+    {                                  \
+      jint __idx = (I);                        \
+      DEBUG_LOCALS_INSN (__idx, 'f');  \
+      locals[__idx].f = (--sp)->f;     \
+    }                                  \
+  while (0)
 #if SIZEOF_VOID_P == 8
-# define STOREL(I)                   \
-  do {                               \
-    DEBUG_LOCALS_INSN (I, 'l');      \
-    DEBUG_LOCALS_INSN (I + 1, 'x');  \
-    (sp -= 2, locals[I].l = sp->l);  \
-  } while (0)
-# define STORED(I)                   \
-  do {                               \
-    DEBUG_LOCALS_INSN (I, 'd');      \
-    DEBUG_LOCALS_INSN (I + 1, 'x');  \
-    (sp -= 2, locals[I].d = sp->d);  \
-  } while (0)
+# define STOREL(I) \
+  do                                           \
+    {                                          \
+      jint __idx = (I);                                \
+      DEBUG_LOCALS_INSN (__idx, 'l');          \
+      DEBUG_LOCALS_INSN (__idx + 1, 'x');      \
+      (sp -= 2, locals[__idx].l = sp->l);      \
+    }                                          \
+  while (0)
+# define STORED(I)                             \
+  do                                           \
+    {                                          \
+      jint __idx = (I);                                \
+      DEBUG_LOCALS_INSN (__idx, 'd');          \
+      DEBUG_LOCALS_INSN (__idx + 1, 'x');      \
+      (sp -= 2, locals[__idx].d = sp->d);      \
+    }                                          \
+  while (0)
 
 #else
-# define STOREL(I)                   \
-  do {                               \
-    DEBUG_LOCALS_INSN (I, 'l');      \
-    DEBUG_LOCALS_INSN (I + 1, 'x');  \
-    jint __idx = (I);                \
-    locals[__idx+1].ia[0] = (--sp)->ia[0];  \
-    locals[__idx].ia[0] = (--sp)->ia[0];    \
-  } while (0)
-# define STORED(I)                   \
-  do {                               \
-    DEBUG_LOCALS_INSN (I, 'd');      \
-    DEBUG_LOCALS_INSN (I + 1, 'x');  \
-    jint __idx = (I);                \
-    locals[__idx+1].ia[0] = (--sp)->ia[0];  \
-    locals[__idx].ia[0] = (--sp)->ia[0];    \
+# define STOREL(I)                             \
+  do                                           \
+    {                                          \
+      jint __idx = (I);                                \
+      DEBUG_LOCALS_INSN (__idx, 'l');          \
+      DEBUG_LOCALS_INSN (__idx + 1, 'x');      \
+      locals[__idx + 1].ia[0] = (--sp)->ia[0]; \
+      locals[__idx].ia[0] = (--sp)->ia[0];     \
+    }                                          \
+  while (0)
+# define STORED(I)                             \
+  do {                                         \
+    jint __idx = (I);                          \
+    DEBUG_LOCALS_INSN (__idx, 'd');            \
+    DEBUG_LOCALS_INSN (__idx + 1, 'x');                \
+    locals[__idx + 1].ia[0] = (--sp)->ia[0];   \
+    locals[__idx].ia[0] = (--sp)->ia[0];       \
   } while (0)
 #endif
 
 #define PEEKI(I)  (locals+(I))->i
 #define PEEKA(I)  (locals+(I))->o
 
-#define POKEI(I,V)                             \
-  DEBUG_LOCALS_INSN(I,'i');                    \
-  ((locals+(I))->i = (V))
+#define POKEI(I,V)                     \
+  do                                   \
+    {                                  \
+      jint __idx = (I);                        \
+      DEBUG_LOCALS_INSN (__idx, 'i');  \
+      ((locals + __idx)->i = (V));     \
+    }                                  \
+  while (0)
 
 
 #define BINOPI(OP) { \
@@ -319,7 +351,7 @@ get4 (unsigned char* loc)
 void
 _Jv_InterpMethod::run_normal (ffi_cif *,
                              void *ret,
-                             ffi_raw *args,
+                             INTERP_FFI_RAW_TYPE *args,
                              void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -329,7 +361,7 @@ _Jv_InterpMethod::run_normal (ffi_cif *,
 void
 _Jv_InterpMethod::run_normal_debug (ffi_cif *,
                                    void *ret,
-                                   ffi_raw *args,
+                                   INTERP_FFI_RAW_TYPE *args,
                                    void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -339,7 +371,7 @@ _Jv_InterpMethod::run_normal_debug (ffi_cif *,
 void
 _Jv_InterpMethod::run_synch_object (ffi_cif *,
                                    void *ret,
-                                   ffi_raw *args,
+                                   INTERP_FFI_RAW_TYPE *args,
                                    void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -353,7 +385,7 @@ _Jv_InterpMethod::run_synch_object (ffi_cif *,
 void
 _Jv_InterpMethod::run_synch_object_debug (ffi_cif *,
                                          void *ret,
-                                         ffi_raw *args,
+                                         INTERP_FFI_RAW_TYPE *args,
                                          void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -367,7 +399,7 @@ _Jv_InterpMethod::run_synch_object_debug (ffi_cif *,
 void
 _Jv_InterpMethod::run_class (ffi_cif *,
                             void *ret,
-                            ffi_raw *args,
+                            INTERP_FFI_RAW_TYPE *args,
                             void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -378,7 +410,7 @@ _Jv_InterpMethod::run_class (ffi_cif *,
 void
 _Jv_InterpMethod::run_class_debug (ffi_cif *,
                                   void *ret,
-                                  ffi_raw *args,
+                                  INTERP_FFI_RAW_TYPE *args,
                                   void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -389,7 +421,7 @@ _Jv_InterpMethod::run_class_debug (ffi_cif *,
 void
 _Jv_InterpMethod::run_synch_class (ffi_cif *,
                                   void *ret,
-                                  ffi_raw *args,
+                                  INTERP_FFI_RAW_TYPE *args,
                                   void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -404,7 +436,7 @@ _Jv_InterpMethod::run_synch_class (ffi_cif *,
 void
 _Jv_InterpMethod::run_synch_class_debug (ffi_cif *,
                                         void *ret,
-                                        ffi_raw *args,
+                                        INTERP_FFI_RAW_TYPE *args,
                                         void *__this)
 {
   _Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
@@ -918,6 +950,25 @@ _Jv_InterpMethod::compile (const void * const *insn_targets)
 
   prepared = insns;
 
+  // Now remap the variable table for this method.
+  for (int i = 0; i < local_var_table_len; ++i)
+    {
+      int start_byte = local_var_table[i].bytecode_pc;
+      if (start_byte < 0 || start_byte >= code_length)
+       start_byte = 0;
+      jlocation start =  pc_mapping[start_byte];
+
+      int end_byte = start_byte + local_var_table[i].length;
+      if (end_byte < 0)
+       end_byte = 0;
+      jlocation end = ((end_byte >= code_length)
+                      ? number_insn_slots
+                      : pc_mapping[end_byte]);
+
+      local_var_table[i].pc = &insns[start];
+      local_var_table[i].length = end - start + 1;
+    }
+  
   if (breakpoint_insn == NULL)
     {
       bp_insn_slot.insn = const_cast<void *> (insn_targets[op_breakpoint]);
@@ -929,9 +980,10 @@ _Jv_InterpMethod::compile (const void * const *insn_targets)
 /* Run the given method.
    When args is NULL, don't run anything -- just compile it. */
 void
-_Jv_InterpMethod::run (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
+_Jv_InterpMethod::run (void *retp, INTERP_FFI_RAW_TYPE *args,
+                      _Jv_InterpMethod *meth)
 {
-#undef DEBUG
+#undef __GCJ_DEBUG
 #undef DEBUG_LOCALS_INSN
 #define DEBUG_LOCALS_INSN(s, t) do {} while (0)
 
@@ -939,9 +991,10 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
 }
 
 void
-_Jv_InterpMethod::run_debug (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
+_Jv_InterpMethod::run_debug (void *retp, INTERP_FFI_RAW_TYPE *args,
+                            _Jv_InterpMethod *meth)
 {
-#define DEBUG
+#define __GCJ_DEBUG
 #undef DEBUG_LOCALS_INSN
 #define DEBUG_LOCALS_INSN(s, t)  \
   do    \
@@ -956,19 +1009,25 @@ _Jv_InterpMethod::run_debug (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
 static void
 throw_internal_error (const char *msg)
 {
-  throw new java::lang::InternalError (JvNewStringLatin1 (msg));
+  jthrowable t = new java::lang::InternalError (JvNewStringLatin1 (msg));
+  REPORT_EXCEPTION (t);
+  throw t;
 }
 
 static void 
 throw_incompatible_class_change_error (jstring msg)
 {
-  throw new java::lang::IncompatibleClassChangeError (msg);
+  jthrowable t = new java::lang::IncompatibleClassChangeError (msg);
+  REPORT_EXCEPTION (t);
+  throw t;
 }
 
 static void 
 throw_null_pointer_exception ()
 {
-  throw new java::lang::NullPointerException;
+  jthrowable t = new java::lang::NullPointerException;
+  REPORT_EXCEPTION (t);
+  throw t;
 }
 
 /* Look up source code line number for given bytecode (or direct threaded
@@ -1254,27 +1313,32 @@ _Jv_init_cif (_Jv_Utf8Const* signature,
   return item_count;
 }
 
-#if FFI_NATIVE_RAW_API
-#   define FFI_PREP_RAW_CLOSURE ffi_prep_raw_closure_loc
-#   define FFI_RAW_SIZE ffi_raw_size
-#else
-#   define FFI_PREP_RAW_CLOSURE ffi_prep_java_raw_closure_loc
-#   define FFI_RAW_SIZE ffi_java_raw_size
-#endif
-
 /* we put this one here, and not in interpret.cc because it
  * calls the utility routines _Jv_count_arguments 
  * which are static to this module.  The following struct defines the
  * layout we use for the stubs, it's only used in the ncode method. */
 
+#if FFI_NATIVE_RAW_API
+#   define FFI_PREP_RAW_CLOSURE ffi_prep_raw_closure_loc
+#   define FFI_RAW_SIZE ffi_raw_size
 typedef struct {
   ffi_raw_closure  closure;
   _Jv_ClosureList list;
   ffi_cif   cif;
   ffi_type *arg_types[0];
 } ncode_closure;
-
-typedef void (*ffi_closure_fun) (ffi_cif*,void*,ffi_raw*,void*);
+typedef void (*ffi_closure_fun) (ffi_cif*,void*,INTERP_FFI_RAW_TYPE*,void*);
+#else
+#   define FFI_PREP_RAW_CLOSURE ffi_prep_java_raw_closure_loc
+#   define FFI_RAW_SIZE ffi_java_raw_size
+typedef struct {
+  ffi_java_raw_closure  closure;
+  _Jv_ClosureList list;
+  ffi_cif   cif;
+  ffi_type *arg_types[0];
+} ncode_closure;
+typedef void (*ffi_closure_fun) (ffi_cif*,void*,ffi_java_raw*,void*);
+#endif
 
 void *
 _Jv_InterpMethod::ncode (jclass klass)
@@ -1480,7 +1544,11 @@ _Jv_InterpMethod::get_local_var_table (char **name, char **sig,
                                        char **generic_sig, jlong *startloc,
                                        jint *length, jint *slot, 
                                        int table_slot)
-{      
+{
+#ifdef DIRECT_THREADED
+  _Jv_CompileMethod (this);
+#endif
+
   if (local_var_table == NULL)
     return -2;
   if (table_slot >= local_var_table_len)
@@ -1491,12 +1559,15 @@ _Jv_InterpMethod::get_local_var_table (char **name, char **sig,
       *sig = local_var_table[table_slot].descriptor;
       *generic_sig = local_var_table[table_slot].descriptor;
 
-      *startloc = static_cast<jlong> 
-                    (local_var_table[table_slot].bytecode_start_pc);
+#ifdef DIRECT_THREADED
+      *startloc = insn_index (local_var_table[table_slot].pc);
+#else
+      *startloc = static_cast<jlong> (local_var_table[table_slot].bytecode_pc);
+#endif
       *length = static_cast<jint> (local_var_table[table_slot].length);
       *slot = static_cast<jint> (local_var_table[table_slot].slot);
     }
-  return local_var_table_len - table_slot -1;
+  return local_var_table_len - table_slot - 1;
 }
 
 pc_t
@@ -1545,6 +1616,23 @@ _Jv_InterpMethod::set_insn (jlong index, pc_t insn)
   return &code[index];
 }
 
+bool
+_Jv_InterpMethod::breakpoint_at (jlong index)
+{
+  pc_t insn = get_insn (index);
+  if (insn != NULL)
+    {
+#ifdef DIRECT_THREADED
+      return (insn->insn == breakpoint_insn->insn);
+#else
+      pc_t code = reinterpret_cast<pc_t> (bytecode ());
+      return (code[index] == breakpoint_insn);
+#endif
+    }
+
+  return false;
+}
+
 void *
 _Jv_JNIMethod::ncode (jclass klass)
 {
@@ -1613,9 +1701,11 @@ _Jv_JNIMethod::ncode (jclass klass)
 static void
 throw_class_format_error (jstring msg)
 {
-  throw (msg
+  jthrowable t = (msg
         ? new java::lang::ClassFormatError (msg)
         : new java::lang::ClassFormatError);
+  REPORT_EXCEPTION (t);
+  throw t;
 }
 
 static void
@@ -1624,6 +1714,70 @@ throw_class_format_error (const char *msg)
   throw_class_format_error (JvNewStringLatin1 (msg));
 }
 
+/* This function finds the method and location where the exception EXC
+   is caught in the stack frame. On return, it sets CATCH_METHOD and
+   CATCH_LOCATION with the method and location where the catch will
+   occur. If the exception is not caught, these are set to 0.
+
+   This function should only be used with the __GCJ_DEBUG interpreter. */
+static void
+find_catch_location (::java::lang::Throwable *exc, jthread thread,
+                    jmethodID *catch_method, jlong *catch_loc)
+{
+  *catch_method = 0;
+  *catch_loc = 0;
+
+  _Jv_InterpFrame *frame
+    = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
+  while (frame != NULL)
+    {
+      pc_t pc = frame->get_pc ();
+      _Jv_InterpMethod *imeth
+       = reinterpret_cast<_Jv_InterpMethod *> (frame->self);
+      if (imeth->check_handler (&pc, imeth, exc))
+       {
+         // This method handles the exception.
+         *catch_method = imeth->get_method ();
+         *catch_loc = imeth->insn_index (pc);
+         return;
+       }
+
+      frame = frame->next_interp;
+    }
+}
+
+/* This method handles JVMTI notifications of thrown exceptions. It
+   calls find_catch_location to figure out where the exception is
+   caught (if it is caught).
+   
+   Like find_catch_location, this should only be called with the
+   __GCJ_DEBUG interpreter. Since a few exceptions occur outside the
+   interpreter proper, it is important to not call this function
+   without checking JVMTI_REQUESTED_EVENT(Exception) first. */
+void
+_Jv_ReportJVMTIExceptionThrow (jthrowable ex)
+{
+  jthread thread = ::java::lang::Thread::currentThread ();
+  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  jmethodID throw_meth = frame->self->get_method ();
+  jlocation throw_loc = -1;
+  if (frame->frame_type == frame_interpreter)
+    {
+      _Jv_InterpFrame * iframe
+       = reinterpret_cast<_Jv_InterpFrame *> (frame);
+      _Jv_InterpMethod *imeth
+       = reinterpret_cast<_Jv_InterpMethod *> (frame->self);
+      throw_loc = imeth->insn_index (iframe->get_pc ());
+    }
+
+  jlong catch_loc;
+  jmethodID catch_method;
+  find_catch_location (ex, thread, &catch_method, &catch_loc);
+  _Jv_JVMTI_PostEvent (JVMTI_EVENT_EXCEPTION, thread,
+                      _Jv_GetCurrentJNIEnv (), throw_meth, throw_loc,
+                      ex, catch_method, catch_loc);
+}
+
 \f
 
 void
@@ -1788,5 +1942,3 @@ _Jv_CompileMethod (_Jv_InterpMethod* method)
     }
 }
 #endif // DIRECT_THREADED
-
-#endif // INTERPRETER