Mercurial > hg > truffle

changeset 11422:774e1c2f8741

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include Graal in some ifdefs related to rbp allocation
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 26 Aug 2013 18:04:53 +0200
parents 966d4517bf58
children 496cf245f023
files src/cpu/x86/vm/frame_x86.cpp src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp src/os_cpu/linux_x86/vm/thread_linux_x86.cpp src/os_cpu/windows_x86/vm/thread_windows_x86.cpp
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp	Mon Aug 26 18:03:09 2013 +0200
+++ b/src/cpu/x86/vm/frame_x86.cpp	Mon Aug 26 18:04:53 2013 +0200
@@ -461,11 +461,11 @@
   // This is the sp before any possible extension (adapter/locals).
   intptr_t* unextended_sp = interpreter_frame_sender_sp();
 
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
   if (map->update_map()) {
     update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset));
   }
-#endif // COMPILER2
+#endif // COMPILER2 || GRAAL
 
   return frame(sender_sp, unextended_sp, link(), sender_pc());
 }
--- a/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp	Mon Aug 26 18:03:09 2013 +0200
+++ b/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp	Mon Aug 26 18:04:53 2013 +0200
@@ -66,7 +66,7 @@
 
     frame ret_frame(ret_sp, ret_fp, addr.pc());
     if (!ret_frame.safe_for_sender(jt)) {
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
       // C2 uses ebp as a general register see if NULL fp helps
       frame ret_frame2(ret_sp, NULL, addr.pc());
       if (!ret_frame2.safe_for_sender(jt)) {
@@ -77,7 +77,7 @@
 #else
       // nothing else to try if the frame isn't good
       return false;
-#endif /* COMPILER2 */
+#endif /* COMPILER2 || GRAAL*/
     }
     *fr_addr = ret_frame;
     return true;
--- a/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp	Mon Aug 26 18:03:09 2013 +0200
+++ b/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp	Mon Aug 26 18:04:53 2013 +0200
@@ -67,7 +67,7 @@
 
     frame ret_frame(ret_sp, ret_fp, addr.pc());
     if (!ret_frame.safe_for_sender(jt)) {
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
       // C2 uses ebp as a general register see if NULL fp helps
       frame ret_frame2(ret_sp, NULL, addr.pc());
       if (!ret_frame2.safe_for_sender(jt)) {
@@ -78,7 +78,7 @@
 #else
       // nothing else to try if the frame isn't good
       return false;
-#endif /* COMPILER2 */
+#endif /* COMPILER2 || GRAAL */
     }
     *fr_addr = ret_frame;
     return true;
--- a/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp	Mon Aug 26 18:03:09 2013 +0200
+++ b/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp	Mon Aug 26 18:04:53 2013 +0200
@@ -74,7 +74,7 @@
 
     frame ret_frame(ret_sp, ret_fp, addr.pc());
     if (!ret_frame.safe_for_sender(jt)) {
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
       // C2 uses ebp as a general register see if NULL fp helps
       frame ret_frame2(ret_sp, NULL, addr.pc());
       if (!ret_frame2.safe_for_sender(jt)) {
@@ -85,7 +85,7 @@
 #else
       // nothing else to try if the frame isn't good
       return false;
-#endif /* COMPILER2 */
+#endif /* COMPILER2 || GRAAL */
     }
     *fr_addr = ret_frame;
     return true;