Mercurial > hg > graal-compiler
comparison src/share/vm/opto/type.cpp @ 12816:2720ab7a0d70
Merge
author | ccheung |
---|---|
date | Fri, 04 Oct 2013 21:00:43 -0700 |
parents | c9ccd7b85f20 |
children | b2ee5dc63353 |
comparison
equal
deleted
inserted
replaced
12815:4212bfb33d76 | 12816:2720ab7a0d70 |
---|---|
427 | 427 |
428 const Type **longpair = TypeTuple::fields(2); | 428 const Type **longpair = TypeTuple::fields(2); |
429 longpair[0] = TypeLong::LONG; | 429 longpair[0] = TypeLong::LONG; |
430 longpair[1] = TypeLong::LONG; | 430 longpair[1] = TypeLong::LONG; |
431 TypeTuple::LONG_PAIR = TypeTuple::make(2, longpair); | 431 TypeTuple::LONG_PAIR = TypeTuple::make(2, longpair); |
432 | |
433 const Type **intccpair = TypeTuple::fields(2); | |
434 intccpair[0] = TypeInt::INT; | |
435 intccpair[1] = TypeInt::CC; | |
436 TypeTuple::INT_CC_PAIR = TypeTuple::make(2, intccpair); | |
432 | 437 |
433 _const_basic_type[T_NARROWOOP] = TypeNarrowOop::BOTTOM; | 438 _const_basic_type[T_NARROWOOP] = TypeNarrowOop::BOTTOM; |
434 _const_basic_type[T_NARROWKLASS] = Type::BOTTOM; | 439 _const_basic_type[T_NARROWKLASS] = Type::BOTTOM; |
435 _const_basic_type[T_BOOLEAN] = TypeInt::BOOL; | 440 _const_basic_type[T_BOOLEAN] = TypeInt::BOOL; |
436 _const_basic_type[T_CHAR] = TypeInt::CHAR; | 441 _const_basic_type[T_CHAR] = TypeInt::CHAR; |
1644 const TypeTuple *TypeTuple::MEMBAR; | 1649 const TypeTuple *TypeTuple::MEMBAR; |
1645 const TypeTuple *TypeTuple::STORECONDITIONAL; | 1650 const TypeTuple *TypeTuple::STORECONDITIONAL; |
1646 const TypeTuple *TypeTuple::START_I2C; | 1651 const TypeTuple *TypeTuple::START_I2C; |
1647 const TypeTuple *TypeTuple::INT_PAIR; | 1652 const TypeTuple *TypeTuple::INT_PAIR; |
1648 const TypeTuple *TypeTuple::LONG_PAIR; | 1653 const TypeTuple *TypeTuple::LONG_PAIR; |
1654 const TypeTuple *TypeTuple::INT_CC_PAIR; | |
1649 | 1655 |
1650 | 1656 |
1651 //------------------------------make------------------------------------------- | 1657 //------------------------------make------------------------------------------- |
1652 // Make a TypeTuple from the range of a method signature | 1658 // Make a TypeTuple from the range of a method signature |
1653 const TypeTuple *TypeTuple::make_range(ciSignature* sig) { | 1659 const TypeTuple *TypeTuple::make_range(ciSignature* sig) { |