Mercurial > hg > graal-compiler

comparison src/share/vm/c1x/c1x_VMEntries.cpp @ 1470:ef7761803480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to get running again after C1X changes to pointer maps and register configuration.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 23 Nov 2010 15:45:45 +0100
parents 2c754f3a2722
children 30e1f67703da
comparison
equal deleted inserted replaced
1469:52bb06250d35 1470:ef7761803480
166 constantPoolOop cp = VmIds::get<constantPoolOop>(vmId); 166 constantPoolOop cp = VmIds::get<constantPoolOop>(vmId);
167 167
168 oop result = NULL; 168 oop result = NULL;
169 constantTag tag = cp->tag_at(index); 169 constantTag tag = cp->tag_at(index);
170 if (tag.is_int()) { 170 if (tag.is_int()) {
171 result = VMExits::createCiConstantLong(cp->int_at(index), CHECK_0); 171 result = VMExits::createCiConstant(CiKind::Int(), cp->int_at(index), CHECK_0);
172 CiValue::set_kind(result, CiKind::Int());
173 } else if (tag.is_long()) { 172 } else if (tag.is_long()) {
174 result = VMExits::createCiConstantLong(cp->long_at(index), CHECK_0); 173 result = VMExits::createCiConstant(CiKind::Long(), cp->long_at(index), CHECK_0);
175 } else if (tag.is_float()) { 174 } else if (tag.is_float()) {
176 result = VMExits::createCiConstantFloat(cp->float_at(index), CHECK_0); 175 result = VMExits::createCiConstantFloat(cp->float_at(index), CHECK_0);
177 } else if (tag.is_double()) { 176 } else if (tag.is_double()) {
178 result = VMExits::createCiConstantDouble(cp->double_at(index), CHECK_0); 177 result = VMExits::createCiConstantDouble(cp->double_at(index), CHECK_0);
179 } else if (tag.is_string() || tag.is_unresolved_string()) { 178 } else if (tag.is_string() || tag.is_unresolved_string()) {
272 break; 271 break;
273 case T_DOUBLE: 272 case T_DOUBLE:
274 constant_object = VMExits::createCiConstantDouble(constant.as_double(), CHECK_0); 273 constant_object = VMExits::createCiConstantDouble(constant.as_double(), CHECK_0);
275 break; 274 break;
276 case T_LONG: 275 case T_LONG:
277 constant_object = VMExits::createCiConstantLong(constant.as_long(), CHECK_0); 276 constant_object = VMExits::createCiConstant(CiKind::Long(), constant.as_long(), CHECK_0);
278 break; 277 break;
279 case T_INT: 278 case T_INT:
280 constant_object = VMExits::createCiConstantLong(constant.as_int(), CHECK_0); 279 constant_object = VMExits::createCiConstant(CiKind::Int(), constant.as_int(), CHECK_0);
281 CiValue::set_kind(constant_object, CiKind::Int());
282 break; 280 break;
283 case T_SHORT: 281 case T_SHORT:
284 constant_object = VMExits::createCiConstantLong(constant.as_int(), CHECK_0); 282 constant_object = VMExits::createCiConstant(CiKind::Short(), constant.as_int(), CHECK_0);
285 CiValue::set_kind(constant_object, CiKind::Short());
286 break; 283 break;
287 case T_CHAR: 284 case T_CHAR:
288 constant_object = VMExits::createCiConstantLong(constant.as_int(), CHECK_0); 285 constant_object = VMExits::createCiConstant(CiKind::Char(), constant.as_int(), CHECK_0);
289 CiValue::set_kind(constant_object, CiKind::Char());
290 break; 286 break;
291 case T_BYTE: 287 case T_BYTE:
292 constant_object = VMExits::createCiConstantLong(constant.as_int(), CHECK_0); 288 constant_object = VMExits::createCiConstant(CiKind::Byte(), constant.as_int(), CHECK_0);
293 CiValue::set_kind(constant_object, CiKind::Byte());
294 break; 289 break;
295 case T_BOOLEAN: 290 case T_BOOLEAN:
296 constant_object = VMExits::createCiConstantLong(constant.as_int(), CHECK_0); 291 constant_object = VMExits::createCiConstant(CiKind::Boolean(), constant.as_int(), CHECK_0);
297 CiValue::set_kind(constant_object, CiKind::Boolean());
298 break; 292 break;
299 default: 293 default:
300 constant.print(); 294 constant.print();
301 fatal("Unhandled constant"); 295 fatal("Unhandled constant");
302 } 296 }