comparison src/cpu/sparc/vm/graalCodeInstaller_sparc.hpp @ 14574:6bab029d6e3a

removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
author twisti
date Mon, 17 Mar 2014 17:32:35 -0700
parents e14198669e5c
children
comparison
equal deleted inserted replaced
14573:e3888db8b8a1 14574:6bab029d6e3a
96 if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) { 96 if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) {
97 method = getMethodFromHotSpotMethod(hotspot_method); 97 method = getMethodFromHotSpotMethod(hotspot_method);
98 } 98 }
99 #endif 99 #endif
100 switch (_next_call_type) { 100 switch (_next_call_type) {
101 case MARK_INLINE_INVOKE: 101 case INLINE_INVOKE:
102 break; 102 break;
103 case MARK_INVOKEVIRTUAL: 103 case INVOKEVIRTUAL:
104 case MARK_INVOKEINTERFACE: { 104 case INVOKEINTERFACE: {
105 assert(method == NULL || !method->is_static(), "cannot call static method with invokeinterface"); 105 assert(method == NULL || !method->is_static(), "cannot call static method with invokeinterface");
106 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset); 106 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
107 call->set_destination(SharedRuntime::get_resolve_virtual_call_stub()); 107 call->set_destination(SharedRuntime::get_resolve_virtual_call_stub());
108 _instructions->relocate(call->instruction_address(), virtual_call_Relocation::spec(_invoke_mark_pc)); 108 _instructions->relocate(call->instruction_address(), virtual_call_Relocation::spec(_invoke_mark_pc));
109 break; 109 break;
110 } 110 }
111 case MARK_INVOKESTATIC: { 111 case INVOKESTATIC: {
112 assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic"); 112 assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic");
113 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset); 113 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
114 call->set_destination(SharedRuntime::get_resolve_static_call_stub()); 114 call->set_destination(SharedRuntime::get_resolve_static_call_stub());
115 _instructions->relocate(call->instruction_address(), relocInfo::static_call_type); 115 _instructions->relocate(call->instruction_address(), relocInfo::static_call_type);
116 break; 116 break;
117 } 117 }
118 case MARK_INVOKESPECIAL: { 118 case INVOKESPECIAL: {
119 assert(method == NULL || !method->is_static(), "cannot call static method with invokespecial"); 119 assert(method == NULL || !method->is_static(), "cannot call static method with invokespecial");
120 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset); 120 NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
121 call->set_destination(SharedRuntime::get_resolve_opt_virtual_call_stub()); 121 call->set_destination(SharedRuntime::get_resolve_opt_virtual_call_stub());
122 _instructions->relocate(call->instruction_address(), relocInfo::opt_virtual_call_type); 122 _instructions->relocate(call->instruction_address(), relocInfo::opt_virtual_call_type);
123 break; 123 break;
128 } 128 }
129 } 129 }
130 130
131 inline void CodeInstaller::pd_relocate_poll(address pc, jint mark) { 131 inline void CodeInstaller::pd_relocate_poll(address pc, jint mark) {
132 switch (mark) { 132 switch (mark) {
133 case MARK_POLL_NEAR: { 133 case POLL_NEAR: {
134 fatal("unimplemented"); 134 fatal("unimplemented");
135 } 135 }
136 case MARK_POLL_FAR: 136 case POLL_FAR:
137 _instructions->relocate(pc, relocInfo::poll_type); 137 _instructions->relocate(pc, relocInfo::poll_type);
138 break; 138 break;
139 case MARK_POLL_RETURN_NEAR: { 139 case POLL_RETURN_NEAR: {
140 fatal("unimplemented"); 140 fatal("unimplemented");
141 } 141 }
142 case MARK_POLL_RETURN_FAR: 142 case POLL_RETURN_FAR:
143 _instructions->relocate(pc, relocInfo::poll_return_type); 143 _instructions->relocate(pc, relocInfo::poll_return_type);
144 break; 144 break;
145 default: 145 default:
146 fatal("invalid mark value"); 146 fatal("invalid mark value");
147 break; 147 break;