diff src/cpu/x86/vm/frame_x86.cpp @ 1491:befdf73d6b82

Merge
author tonyp
date Mon, 03 May 2010 16:31:07 -0400
parents 615a9d95d265
children df736661d0c8
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp	Thu Apr 29 00:03:40 2010 -0700
+++ b/src/cpu/x86/vm/frame_x86.cpp	Mon May 03 16:31:07 2010 -0400
@@ -291,8 +291,8 @@
 BasicObjectLock* frame::interpreter_frame_monitor_end() const {
   BasicObjectLock* result = (BasicObjectLock*) *addr_at(interpreter_frame_monitor_block_top_offset);
   // make sure the pointer points inside the frame
-  assert((intptr_t) fp() >  (intptr_t) result, "result must <  than frame pointer");
-  assert((intptr_t) sp() <= (intptr_t) result, "result must >= than stack pointer");
+  assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer");
+  assert((intptr_t*) result < fp(),  "monitor end should be strictly below the frame pointer");
   return result;
 }