Frame::getCallingJavaMethod() now takes a stack depth parameter which indicates

the number of levels to pop the stack.

ef/Runtime/System/StackWalker.cpp

@@ -87,7 +87,7 @@ getStackDepth()
 //
 // Move the cursor of this frame to the closest Java frame and
 // return the method corresponding to that frame
-Method &Frame::getCallingJavaMethod()
+Method &Frame::getCallingJavaMethod(int climbDepth)
 {
 	Method *m;
 
@@ -100,7 +100,7 @@ Method &Frame::getCallingJavaMethod()
 			m = getMethodForPC(pMethodAddress);
 		}
 
-	} while ((m->getModifiers() & CR_METHOD_NATIVE));
+	} while ((m->getModifiers() & CR_METHOD_NATIVE) || --climbDepth);
 
 	return *m;
 }

ef/Runtime/System/StackWalker.h

@@ -41,7 +41,7 @@ public:
     Uint8**		getBase()		{ return pFrame; }
     static int  getStackDepth();
 	
-	Method &getCallingJavaMethod();
+	Method &getCallingJavaMethod(int climbDepth = 1);
 
 	// returns the Method associated with the frame, or NULL if there is not one
 	Method*	getMethod();