Mercurial > hg > truffle

comparison src/cpu/x86/vm/frame_x86.cpp @ 12873:4e7f99b70d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 190899198332
children cefad50507d8 c586f8a7322f
comparison
equal deleted inserted replaced
12872:98692a2d36d7 12873:4e7f99b70d9d
637 oop obj; 637 oop obj;
638 if (method->is_native()) { 638 if (method->is_native()) {
639 #ifdef CC_INTERP 639 #ifdef CC_INTERP
640 obj = istate->_oop_temp; 640 obj = istate->_oop_temp;
641 #else 641 #else
642 obj = (oop) at(interpreter_frame_oop_temp_offset); 642 obj = cast_to_oop(at(interpreter_frame_oop_temp_offset));
643 #endif // CC_INTERP 643 #endif // CC_INTERP
644 } else { 644 } else {
645 oop* obj_p = (oop*)tos_addr; 645 oop* obj_p = (oop*)tos_addr;
646 obj = (obj_p == NULL) ? (oop)NULL : *obj_p; 646 obj = (obj_p == NULL) ? (oop)NULL : *obj_p;
647 } 647 }