Mercurial > hg > truffle
comparison src/cpu/zero/vm/sharedRuntime_zero.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | e16282db4946 |
children | de6a9e811145 6a936747b569 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
87 compile_id, | 87 compile_id, |
88 sig_bt, | 88 sig_bt, |
89 ret_type); | 89 ret_type); |
90 #else | 90 #else |
91 ShouldNotCallThis(); | 91 ShouldNotCallThis(); |
92 return NULL; | |
92 #endif // SHARK | 93 #endif // SHARK |
93 } | 94 } |
94 | 95 |
95 int Deoptimization::last_frame_adjust(int callee_parameters, | 96 int Deoptimization::last_frame_adjust(int callee_parameters, |
96 int callee_locals) { | 97 int callee_locals) { |
97 return 0; | 98 return 0; |
98 } | 99 } |
99 | 100 |
100 uint SharedRuntime::out_preserve_stack_slots() { | 101 uint SharedRuntime::out_preserve_stack_slots() { |
101 ShouldNotCallThis(); | 102 ShouldNotCallThis(); |
103 return 0; | |
102 } | 104 } |
103 | 105 |
104 JRT_LEAF(void, zero_stub()) | 106 JRT_LEAF(void, zero_stub()) |
105 ShouldNotCallThis(); | 107 ShouldNotCallThis(); |
106 JRT_END | 108 JRT_END |
133 | 135 |
134 int SharedRuntime::c_calling_convention(const BasicType *sig_bt, | 136 int SharedRuntime::c_calling_convention(const BasicType *sig_bt, |
135 VMRegPair *regs, | 137 VMRegPair *regs, |
136 int total_args_passed) { | 138 int total_args_passed) { |
137 ShouldNotCallThis(); | 139 ShouldNotCallThis(); |
140 return 0; | |
138 } | 141 } |