Mercurial > hg > graal-compiler

changeset 9359:44e05c9afb54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replaced definition of SLOT_PER_WORD with use of VMRegImpl::slots_per_word
author Doug Simon <doug.simon@oracle.com>
date Sat, 27 Apr 2013 10:13:10 +0200
parents f1ffa0639a2a
children 545a023c2ca3
files src/share/vm/graal/graalCodeInstaller.cpp
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Sat Apr 27 08:59:28 2013 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Sat Apr 27 10:13:10 2013 +0200
@@ -81,12 +81,6 @@
   return arr->length() * MapWordBits;
 }
 
-#ifdef _LP64
-  #define SLOTS_PER_WORD 2
-#else
-  #define SLOTS_PER_WORD 1
-#endif // _LP64
-
 // creates a HotSpot oop map out of the byte arrays provided by DebugInfo
 static OopMap* create_oop_map(jint total_frame_size, jint parameter_count, oop debug_info) {
   OopMap* map = new OopMap(total_frame_size, parameter_count);
@@ -109,7 +103,7 @@
   for (jint i = 0; i < bitset_size(frame_map); i++) {
     bool is_oop = is_bit_set(frame_map, i);
     // HotSpot stack slots are 4 bytes
-    VMReg reg = VMRegImpl::stack2reg(i * SLOTS_PER_WORD);
+    VMReg reg = VMRegImpl::stack2reg(i * VMRegImpl::slots_per_word);
     if (is_oop) {
       map->set_oop(reg);
     } else {
@@ -126,7 +120,7 @@
       VMReg hotspot_reg = get_hotspot_reg(graal_reg_number);
       // HotSpot stack slots are 4 bytes
       jint graal_slot = ((jint*) slots->base(T_INT))[i];
-      jint hotspot_slot = graal_slot * SLOTS_PER_WORD;
+      jint hotspot_slot = graal_slot * VMRegImpl::slots_per_word;
       VMReg hotspot_slot_as_reg = VMRegImpl::stack2reg(hotspot_slot);
       map->set_callee_saved(hotspot_slot_as_reg, hotspot_reg);
 #ifdef _LP64