comparison src/share/vm/prims/forte.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c a9becfeecd1b
children 61b6c57421c2
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
69 //------------------------------------------------------- 69 //-------------------------------------------------------
70 70
71 // Native interfaces for use by Forte tools. 71 // Native interfaces for use by Forte tools.
72 72
73 73
74 #ifndef IA64 74 #if !defined(IA64) && !defined(PPC64)
75 75
76 class vframeStreamForte : public vframeStreamCommon { 76 class vframeStreamForte : public vframeStreamCommon {
77 public: 77 public:
78 // constructor that starts with sender of frame fr (top_frame) 78 // constructor that starts with sender of frame fr (top_frame)
79 vframeStreamForte(JavaThread *jt, frame fr, bool stop_at_java_call_stub); 79 vframeStreamForte(JavaThread *jt, frame fr, bool stop_at_java_call_stub);
627 ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),(void)0 : (void)0 ) 627 ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),(void)0 : (void)0 )
628 #endif // __APPLE__ 628 #endif // __APPLE__
629 #endif // !_WINDOWS 629 #endif // !_WINDOWS
630 630
631 } // end extern "C" 631 } // end extern "C"
632 #endif // !IA64 632 #endif // !IA64 && !PPC64
633 633
634 void Forte::register_stub(const char* name, address start, address end) { 634 void Forte::register_stub(const char* name, address start, address end) {
635 #if !defined(_WINDOWS) && !defined(IA64) 635 #if !defined(_WINDOWS) && !defined(IA64) && !defined(PPC64)
636 assert(pointer_delta(end, start, sizeof(jbyte)) < INT_MAX, 636 assert(pointer_delta(end, start, sizeof(jbyte)) < INT_MAX,
637 "Code size exceeds maximum range"); 637 "Code size exceeds maximum range");
638 638
639 collector_func_load((char*)name, NULL, NULL, start, 639 collector_func_load((char*)name, NULL, NULL, start,
640 pointer_delta(end, start, sizeof(jbyte)), 0, NULL); 640 pointer_delta(end, start, sizeof(jbyte)), 0, NULL);
641 #endif // !_WINDOWS && !IA64 641 #endif // !_WINDOWS && !IA64 && !PPC64
642 } 642 }
643 643
644 #else // INCLUDE_JVMTI 644 #else // INCLUDE_JVMTI
645 extern "C" { 645 extern "C" {
646 JNIEXPORT 646 JNIEXPORT