comparison src/share/vm/asm/assembler.hpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 1d7922586cf6
children b9a9ed0f8eeb
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
404 // Thus, the eventual value of the constant must not be zero. 404 // Thus, the eventual value of the constant must not be zero.
405 // This is fine, since this is designed for embedding object field 405 // This is fine, since this is designed for embedding object field
406 // offsets in code which must be generated before the object class is loaded. 406 // offsets in code which must be generated before the object class is loaded.
407 // Field offsets are never zero, since an object's header (mark word) 407 // Field offsets are never zero, since an object's header (mark word)
408 // is located at offset zero. 408 // is located at offset zero.
409 RegisterOrConstant delayed_value(int(*value_fn)(), Register tmp, int offset = 0) { 409 RegisterOrConstant delayed_value(int(*value_fn)(), Register tmp, int offset = 0);
410 return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset); 410 RegisterOrConstant delayed_value(address(*value_fn)(), Register tmp, int offset = 0);
411 }
412 RegisterOrConstant delayed_value(address(*value_fn)(), Register tmp, int offset = 0) {
413 return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset);
414 }
415 virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) = 0; 411 virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) = 0;
416 // Last overloading is platform-dependent; look in assembler_<arch>.cpp. 412 // Last overloading is platform-dependent; look in assembler_<arch>.cpp.
417 static intptr_t* delayed_value_addr(int(*constant_fn)()); 413 static intptr_t* delayed_value_addr(int(*constant_fn)());
418 static intptr_t* delayed_value_addr(address(*constant_fn)()); 414 static intptr_t* delayed_value_addr(address(*constant_fn)());
419 static void update_delayed_values(); 415 static void update_delayed_values();