Mercurial > hg > graal-compiler
comparison src/os_cpu/windows_x86/vm/os_windows_x86.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 291ffc492eb6 12285410684f |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
397 #ifdef AMD64 | 397 #ifdef AMD64 |
398 // apparently _asm not supported on windows amd64 | 398 // apparently _asm not supported on windows amd64 |
399 typedef intptr_t* get_fp_func (); | 399 typedef intptr_t* get_fp_func (); |
400 get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*, | 400 get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*, |
401 StubRoutines::x86::get_previous_fp_entry()); | 401 StubRoutines::x86::get_previous_fp_entry()); |
402 if (func == NULL) return frame(NULL, NULL, NULL); | 402 if (func == NULL) return frame(); |
403 intptr_t* fp = (*func)(); | 403 intptr_t* fp = (*func)(); |
404 #else | 404 #else |
405 intptr_t* fp = _get_previous_fp(); | 405 intptr_t* fp = _get_previous_fp(); |
406 #endif // AMD64 | 406 #endif // AMD64 |
407 | 407 |
408 frame myframe((intptr_t*)os::current_stack_pointer(), | 408 frame myframe((intptr_t*)os::current_stack_pointer(), |
409 (intptr_t*)fp, | 409 (intptr_t*)fp, |
410 CAST_FROM_FN_PTR(address, os::current_frame)); | 410 CAST_FROM_FN_PTR(address, os::current_frame)); |
411 if (os::is_first_C_frame(&myframe)) { | 411 if (os::is_first_C_frame(&myframe)) { |
412 // stack is not walkable | 412 // stack is not walkable |
413 return frame(NULL, NULL, NULL); | 413 return frame(); |
414 } else { | 414 } else { |
415 return os::get_sender_for_C_frame(&myframe); | 415 return os::get_sender_for_C_frame(&myframe); |
416 } | 416 } |
417 } | 417 } |
418 | 418 |