comparison src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 4976:8f01f899bccd

More GRAAL #ifdef; ignore graal directory on windows for client/server configuration.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 16:26:41 +0100
parents 33df1aeaebbf
children 532be189cf09
comparison
equal deleted inserted replaced
4975:dfa7c9a45d8e 4976:8f01f899bccd
1848 __ pop(rax); 1848 __ pop(rax);
1849 1849
1850 } 1850 }
1851 break; 1851 break;
1852 #endif // !SERIALGC 1852 #endif // !SERIALGC
1853 1853 #ifdef GRAAL
1854 case graal_unwind_exception_call_id: { 1854 case graal_unwind_exception_call_id: {
1855 // remove the frame from the stack 1855 // remove the frame from the stack
1856 __ movptr(rsp, rbp); 1856 __ movptr(rsp, rbp);
1857 __ pop(rbp); 1857 __ pop(rbp);
1858 // exception_oop is passed using ordinary java calling conventions 1858 // exception_oop is passed using ordinary java calling conventions
2051 restore_live_registers(sasm, save_fpu_registers); 2051 restore_live_registers(sasm, save_fpu_registers);
2052 } 2052 }
2053 __ ret(0); 2053 __ ret(0);
2054 break; 2054 break;
2055 } 2055 }
2056 2056 #endif
2057
2058
2059 2057
2060 default: 2058 default:
2061 { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments); 2059 { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
2062 __ movptr(rax, (int)id); 2060 __ movptr(rax, (int)id);
2063 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); 2061 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);