--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Sun Mar 27 00:00:14 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Sun Mar 27 13:17:37 2011 -0700
@@ -580,7 +580,6 @@
void emit_data64(jlong data, relocInfo::relocType rtype, int format = 0);
void emit_data64(jlong data, RelocationHolder const& rspec, int format = 0);
-
bool reachable(AddressLiteral adr) NOT_LP64({ return true;});
// These are all easily abused and hence protected
@@ -683,6 +682,8 @@
static bool is_simm32(int32_t x) { return true; }
#endif // _LP64
+ static bool is_polling_page_far() NOT_LP64({ return false;});
+
// Generic instructions
// Does 32bit or 64bit as needed for the platform. In some sense these
// belong in macro assembler but there is no need for both varieties to exist
@@ -2094,7 +2095,10 @@
void leal32(Register dst, Address src) { leal(dst, src); }
- void test32(Register src1, AddressLiteral src2);
+ // Import other testl() methods from the parent class or else
+ // they will be hidden by the following overriding declaration.
+ using Assembler::testl;
+ void testl(Register dst, AddressLiteral src);
void orptr(Register dst, Address src) { LP64_ONLY(orq(dst, src)) NOT_LP64(orl(dst, src)); }
void orptr(Register dst, Register src) { LP64_ONLY(orq(dst, src)) NOT_LP64(orl(dst, src)); }