# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1389037411 -3600
# Node ID fa5180b3c18e02f940516be1da3f1d3dc364deb2
# Parent  0fbee3eb71f00b90f1974bbe513d8486b1f4bae3
renamed pollingPageDistance enum to pollingForm

diff -r 0fbee3eb71f0 -r fa5180b3c18e src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Jan 06 20:43:31 2014 +0100
@@ -1601,7 +1601,7 @@
   }
 #endif // TIERED
   __ set((intptr_t)os::get_polling_page(), L0);
-  __ relocate(poll_return_Relocation::spec(poll_Relocation::far));
+  __ relocate(poll_return_Relocation::spec(poll_Relocation::absolute));
   __ ld_ptr(L0, 0, G0);
   __ ret();
   __ delayed()->restore();
@@ -1613,7 +1613,7 @@
   if (info != NULL) {
     add_debug_info_for_branch(info);
   } else {
-    __ relocate(poll_Relocation::spec(poll_Relocation::far));
+    __ relocate(poll_Relocation::spec(poll_Relocation::absolute));
   }
 
   int offset = __ offset();
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/cpu/sparc/vm/graalCodeInstaller_sparc.hpp
--- a/src/cpu/sparc/vm/graalCodeInstaller_sparc.hpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/cpu/sparc/vm/graalCodeInstaller_sparc.hpp	Mon Jan 06 20:43:31 2014 +0100
@@ -188,13 +188,13 @@
       fatal("unimplemented");
     }
     case MARK_POLL_FAR:
-      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::far));
+      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::absolute));
       break;
     case MARK_POLL_RETURN_NEAR: {
       fatal("unimplemented");
     }
     case MARK_POLL_RETURN_FAR:
-      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::far));
+      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::absolute));
       break;
     default:
       fatal("invalid mark value");
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/cpu/x86/vm/assembler_x86.cpp	Mon Jan 06 20:43:31 2014 +0100
@@ -81,10 +81,10 @@
     _rspec = runtime_call_Relocation::spec();
     break;
   case relocInfo::poll_type:
-    _rspec = poll_Relocation::spec(Assembler::is_polling_page_far() ? poll_Relocation::far : poll_Relocation::near);
+    _rspec = poll_Relocation::spec(Assembler::is_polling_page_far() ? poll_Relocation::absolute : poll_Relocation::pc_relative);
     break;
   case relocInfo::poll_return_type:
-    _rspec = poll_return_Relocation::spec(Assembler::is_polling_page_far() ? poll_Relocation::far : poll_Relocation::near);
+    _rspec = poll_return_Relocation::spec(Assembler::is_polling_page_far() ? poll_Relocation::absolute : poll_Relocation::pc_relative);
     break;
   case relocInfo::none:
     break;
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/cpu/x86/vm/graalCodeInstaller_x86.hpp
--- a/src/cpu/x86/vm/graalCodeInstaller_x86.hpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/cpu/x86/vm/graalCodeInstaller_x86.hpp	Mon Jan 06 20:43:31 2014 +0100
@@ -232,19 +232,19 @@
   switch (mark) {
     case MARK_POLL_NEAR: {
       relocate_poll_near(pc);
-      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::near));
+      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::pc_relative));
       break;
     }
     case MARK_POLL_FAR:
-      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::far));
+      _instructions->relocate(pc, poll_Relocation::spec(poll_Relocation::absolute));
       break;
     case MARK_POLL_RETURN_NEAR: {
       relocate_poll_near(pc);
-      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::near));
+      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::pc_relative));
       break;
     }
     case MARK_POLL_RETURN_FAR:
-      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::far));
+      _instructions->relocate(pc, poll_return_Relocation::spec(poll_Relocation::absolute));
       break;
     default:
       fatal("invalid mark value");
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/cpu/x86/vm/relocInfo_x86.cpp
--- a/src/cpu/x86/vm/relocInfo_x86.cpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/cpu/x86/vm/relocInfo_x86.cpp	Mon Jan 06 20:43:31 2014 +0100
@@ -179,7 +179,7 @@
 
 void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
 #ifdef _LP64
-  if (_distance == near) {
+  if (_form == pc_relative) {
     typedef Assembler::WhichOperand WhichOperand;
     WhichOperand which = (WhichOperand) format();
     // This format is imm but it is really disp32
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/share/vm/code/relocInfo.cpp
--- a/src/share/vm/code/relocInfo.cpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/share/vm/code/relocInfo.cpp	Mon Jan 06 20:43:31 2014 +0100
@@ -681,12 +681,12 @@
 
 void poll_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
-  p = pack_1_int_to(p, _distance);
+  p = pack_1_int_to(p, _form);
   dest->set_locs_end((relocInfo*) p);
 }
 
 void poll_Relocation::unpack_data() {
-  _distance = (poll_Relocation::pollingPageDistance) unpack_1_int();
+  _form = (poll_Relocation::pollingForm) unpack_1_int();
 }
 
 //// miscellaneous methods
@@ -989,16 +989,16 @@
   case relocInfo::poll_return_type:
     {
       poll_Relocation* r = (poll_Relocation*) reloc();
-      const char *distanceName = "unknown";
-      switch (r->distance()) {
-        case poll_Relocation::near:
-          distanceName = "near";
+      const char *formName = "unknown";
+      switch (r->form()) {
+        case poll_Relocation::pc_relative:
+          formName = "pc_relative";
           break;
-        case poll_Relocation::far:
-          distanceName = "far";
+        case poll_Relocation::absolute:
+          formName = "absolute";
           break;
       }
-      tty->print(" | [distance=%d(%s)]", r->distance(), distanceName);
+      tty->print(" | [form=%d(%s)]", r->form(), formName);
       break;
     }
   }
diff -r 0fbee3eb71f0 -r fa5180b3c18e src/share/vm/code/relocInfo.hpp
--- a/src/share/vm/code/relocInfo.hpp	Mon Jan 06 17:12:09 2014 +0000
+++ b/src/share/vm/code/relocInfo.hpp	Mon Jan 06 20:43:31 2014 +0100
@@ -214,7 +214,7 @@
 //   Value:  none
 //   Instruction types: memory load or test
 //   Data:  []       the associated set-oops are adjacent to the call
-//          [n]      n is a poll_Relocation::pollingPageDistance value
+//          [n]      n is a poll_Relocation::pollingForm value
 //
 // For example:
 //
@@ -1279,27 +1279,27 @@
 
 class poll_Relocation : public Relocation {
  public:
-  enum pollingPageDistance {
-    near,
-    far
+  enum pollingForm {
+    pc_relative,
+    absolute
   };
   relocInfo::relocType type() { return relocInfo::poll_type; }
   bool          is_data()                      { return true; }
   void     fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest);
  private:
-  pollingPageDistance     _distance;
+  pollingForm     _form;
  public:
 
-  static RelocationHolder spec(poll_Relocation::pollingPageDistance distance) {
+  static RelocationHolder spec(poll_Relocation::pollingForm form) {
     RelocationHolder rh = newHolder();
-    new(rh) poll_Relocation(distance);
+    new(rh) poll_Relocation(form);
     return rh;
   }
 
-  poll_Relocation(poll_Relocation::pollingPageDistance distance) {
-    _distance = distance;
+  poll_Relocation(poll_Relocation::pollingForm form) {
+    _form = form;
   }
-  poll_Relocation::pollingPageDistance distance() { return _distance; }
+  poll_Relocation::pollingForm form() { return _form; }
 
   void pack_data_to(CodeSection* dest);
   void unpack_data();
@@ -1313,13 +1313,13 @@
  public:
   relocInfo::relocType type() { return relocInfo::poll_return_type; }
 
-  static RelocationHolder spec(poll_Relocation::pollingPageDistance distance) {
+  static RelocationHolder spec(poll_Relocation::pollingForm distance) {
     RelocationHolder rh = newHolder();
     new(rh) poll_return_Relocation(distance);
     return rh;
   }
 
-  poll_return_Relocation(poll_Relocation::pollingPageDistance distance) : poll_Relocation(distance) { }
+  poll_return_Relocation(poll_Relocation::pollingForm distance) : poll_Relocation(distance) { }
 
  private:
   friend class RelocIterator;