Changeset 1523:833337c65fd3
- Timestamp:
- 07/06/09 18:54:02
(7 months ago)
- Author:
- Robert Clipsham <robert@octarineparrot.com>
- branch:
- default
- Message:
Fixed some unmerged parts of the D2 frontend.
Removed the automatic linker flags for D2 (temp).
Renamed a runtime function for D2.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r1465 |
r1523 |
|
| 8747 | 8747 | e1->checkIntegral(); |
|---|
| 8748 | 8748 | e2 = e2->checkIntegral(); |
|---|
| 8749 | | //e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| 8750 | | e2 = e2->castTo(sc, e1->type); // LDC |
|---|
| | 8749 | #if IN_DMD |
|---|
| | 8750 | e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 8751 | #elif IN_LLVM |
|---|
| | 8752 | e2 = e2->castTo(sc, e1->type); |
|---|
| | 8753 | #endif |
|---|
| 8751 | 8754 | return this; |
|---|
| 8752 | 8755 | } |
|---|
| … | … | |
| 8776 | 8779 | e1->checkIntegral(); |
|---|
| 8777 | 8780 | e2 = e2->checkIntegral(); |
|---|
| 8778 | | //e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| 8779 | | e2 = e2->castTo(sc, e1->type); // LDC |
|---|
| | 8781 | #if IN_DMD |
|---|
| | 8782 | e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 8783 | #elif IN_LLVM |
|---|
| | 8784 | e2 = e2->castTo(sc, e1->type); |
|---|
| | 8785 | #endif |
|---|
| 8780 | 8786 | return this; |
|---|
| 8781 | 8787 | } |
|---|
| … | … | |
| 9344 | 9350 | e2 = e2->checkIntegral(); |
|---|
| 9345 | 9351 | e1 = e1->integralPromotions(sc); |
|---|
| 9346 | | e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 9352 | //e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 9353 | e2 = e2->castTo(sc, e1->type); // LDC |
|---|
| 9347 | 9354 | type = e1->type; |
|---|
| 9348 | 9355 | } |
|---|
| … | … | |
| 9368 | 9375 | e2 = e2->checkIntegral(); |
|---|
| 9369 | 9376 | e1 = e1->integralPromotions(sc); |
|---|
| 9370 | | e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 9377 | //e2 = e2->castTo(sc, Type::tshiftcnt); |
|---|
| | 9378 | e2 = e2->castTo(sc, e1->type); // LDC |
|---|
| 9371 | 9379 | type = e1->type; |
|---|
| 9372 | 9380 | } |
|---|
| r1484 |
r1523 |
|
| 312 | 312 | else if (!noDefaultLib) |
|---|
| 313 | 313 | { |
|---|
| | 314 | #if !DMDV2 |
|---|
| 314 | 315 | global.params.linkswitches->push(mem.strdup("-lldc-runtime")); |
|---|
| 315 | 316 | global.params.linkswitches->push(mem.strdup("-ltango-cc-tango")); |
|---|
| … | … | |
| 318 | 319 | // with linking order |
|---|
| 319 | 320 | global.params.linkswitches->push(mem.strdup("-lldc-runtime")); |
|---|
| | 321 | #endif |
|---|
| 320 | 322 | } |
|---|
| 321 | 323 | |
|---|
| r1512 |
r1523 |
|
| 329 | 329 | // Object _d_allocclass(ClassInfo ci) |
|---|
| 330 | 330 | { |
|---|
| | 331 | #if DMDV2 |
|---|
| | 332 | std::string fname("_d_newclass"); |
|---|
| | 333 | #else |
|---|
| 331 | 334 | std::string fname("_d_allocclass"); |
|---|
| | 335 | #endif |
|---|
| 332 | 336 | std::vector<const LLType*> types; |
|---|
| 333 | 337 | types.push_back(classInfoTy); |
|---|