Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/frame_x86.inline.hpp @ 8883:b9a918201d47
Merge with hsx25
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Sat, 06 Apr 2013 20:04:06 +0200 |
| parents | b8f261ba79c6 0a2deac0bbfb |
| children | 6b0fd0964b87 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.inline.hpp Fri Apr 05 18:53:57 2013 +0200 +++ b/src/cpu/x86/vm/frame_x86.inline.hpp Sat Apr 06 20:04:06 2013 +0200 @@ -295,14 +295,18 @@ return true; } - +inline oop frame::saved_oop_result(RegisterMap* map) const { + oop* result_adr = (oop *)map->location(rax->as_VMReg()); + guarantee(result_adr != NULL, "bad register save location"); -inline oop frame::saved_oop_result(RegisterMap* map) const { - return *((oop*) map->location(rax->as_VMReg())); + return (*result_adr); } inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { - *((oop*) map->location(rax->as_VMReg())) = obj; + oop* result_adr = (oop *)map->location(rax->as_VMReg()); + guarantee(result_adr != NULL, "bad register save location"); + + *result_adr = obj; } #endif // CPU_X86_VM_FRAME_X86_INLINE_HPP