diff src/cpu/x86/vm/assembler_x86_32.hpp @ 344:6aae2f9d0294

Merge
author ysr
date Thu, 12 Jun 2008 13:50:55 -0700
parents 37f87013dfd8 7793bd37a336
children 1ee8caae33af
line wrap: on
line diff
--- a/src/cpu/x86/vm/assembler_x86_32.hpp	Thu Jun 05 15:57:56 2008 -0700
+++ b/src/cpu/x86/vm/assembler_x86_32.hpp	Thu Jun 12 13:50:55 2008 -0700
@@ -1057,7 +1057,7 @@
   // range (0 <= offset <= page_size).
 
   void null_check(Register reg, int offset = -1);
-  static bool needs_explicit_null_check(int offset);
+  static bool needs_explicit_null_check(intptr_t offset);
 
   // Required platform-specific helpers for Label::patch_instructions.
   // They _shadow_ the declarations in AbstractAssembler, which are undefined.