| OLD | NEW |
| 1 //===- subzero/src/IceInstX8632.cpp - X86-32 instruction implementation ---===// | 1 //===- subzero/src/IceInstX8632.cpp - X86-32 instruction implementation ---===// |
| 2 // | 2 // |
| 3 // The Subzero Code Generator | 3 // The Subzero Code Generator |
| 4 // | 4 // |
| 5 // This file is distributed under the University of Illinois Open Source | 5 // This file is distributed under the University of Illinois Open Source |
| 6 // License. See LICENSE.TXT for details. | 6 // License. See LICENSE.TXT for details. |
| 7 // | 7 // |
| 8 //===----------------------------------------------------------------------===// | 8 //===----------------------------------------------------------------------===// |
| 9 // | 9 // |
| 10 // This file implements the InstX8632 and OperandX8632 classes, | 10 // This file implements the InstX8632 and OperandX8632 classes, |
| (...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 if (ShiftReg && ShiftReg->getRegNum() == RegX8632::Reg_ecx) { | 471 if (ShiftReg && ShiftReg->getRegNum() == RegX8632::Reg_ecx) { |
| 472 Str << "cl"; | 472 Str << "cl"; |
| 473 EmittedSrc1 = true; | 473 EmittedSrc1 = true; |
| 474 } | 474 } |
| 475 } | 475 } |
| 476 if (!EmittedSrc1) | 476 if (!EmittedSrc1) |
| 477 Inst->getSrc(1)->emit(Func); | 477 Inst->getSrc(1)->emit(Func); |
| 478 Str << "\n"; | 478 Str << "\n"; |
| 479 } | 479 } |
| 480 | 480 |
| 481 void emitIASVarTyGPR(const Cfg *Func, Type Ty, const Variable *Var, |
| 482 const x86::AssemblerX86::GPREmitterOneOp &Emitter) { |
| 483 x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>(); |
| 484 intptr_t StartPosition = Asm->GetPosition(); |
| 485 if (Var->hasReg()) { |
| 486 // We cheat a little and use GPRRegister even for byte operations. |
| 487 RegX8632::GPRRegister VarReg = |
| 488 RegX8632::getEncodedByteRegOrGPR(Ty, Var->getRegNum()); |
| 489 (Asm->*(Emitter.Reg))(Ty, VarReg); |
| 490 } else { |
| 491 x86::Address StackAddr(static_cast<TargetX8632 *>(Func->getTarget()) |
| 492 ->stackVarToAsmOperand(Var)); |
| 493 (Asm->*(Emitter.Addr))(Ty, StackAddr); |
| 494 } |
| 495 Ostream &Str = Func->getContext()->getStrEmit(); |
| 496 emitIASBytes(Str, Asm, StartPosition); |
| 497 } |
| 498 |
| 499 void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var, |
| 500 const Operand *Src, |
| 501 const x86::AssemblerX86::GPREmitterRegOp &Emitter) { |
| 502 x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>(); |
| 503 intptr_t StartPosition = Asm->GetPosition(); |
| 504 assert(Var->hasReg()); |
| 505 // We cheat a little and use GPRRegister even for byte operations. |
| 506 RegX8632::GPRRegister VarReg = |
| 507 RegX8632::getEncodedByteRegOrGPR(Ty, Var->getRegNum()); |
| 508 if (const Variable *SrcVar = llvm::dyn_cast<Variable>(Src)) { |
| 509 if (SrcVar->hasReg()) { |
| 510 RegX8632::GPRRegister SrcReg; |
| 511 if (Ty == IceType_i8 || Ty == IceType_i1) { |
| 512 SrcReg = static_cast<RegX8632::GPRRegister>( |
| 513 RegX8632::getEncodedByteReg(SrcVar->getRegNum())); |
| 514 } else { |
| 515 SrcReg = RegX8632::getEncodedGPR(SrcVar->getRegNum()); |
| 516 } |
| 517 (Asm->*(Emitter.GPRGPR))(Ty, VarReg, SrcReg); |
| 518 } else { |
| 519 x86::Address SrcStackAddr = static_cast<TargetX8632 *>(Func->getTarget()) |
| 520 ->stackVarToAsmOperand(SrcVar); |
| 521 (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcStackAddr); |
| 522 } |
| 523 } else if (const OperandX8632Mem *Mem = |
| 524 llvm::dyn_cast<OperandX8632Mem>(Src)) { |
| 525 x86::Address SrcAddr = Mem->toAsmAddress(Asm); |
| 526 (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcAddr); |
| 527 } else if (const ConstantInteger32 *Imm = |
| 528 llvm::dyn_cast<ConstantInteger32>(Src)) { |
| 529 (Asm->*(Emitter.GPRImm))(Ty, VarReg, x86::Immediate(Imm->getValue())); |
| 530 } else { |
| 531 llvm_unreachable("Unexpected operand type"); |
| 532 } |
| 533 Ostream &Str = Func->getContext()->getStrEmit(); |
| 534 emitIASBytes(Str, Asm, StartPosition); |
| 535 } |
| 536 |
| 481 void | 537 void |
| 482 emitIASVarOperandTyXMM(const Cfg *Func, Type Ty, const Variable *Var, | 538 emitIASVarOperandTyXMM(const Cfg *Func, Type Ty, const Variable *Var, |
| 483 const Operand *Src, | 539 const Operand *Src, |
| 484 const x86::AssemblerX86::TypedXmmEmitters &Emitter) { | 540 const x86::AssemblerX86::XmmEmitterTwoOps &Emitter) { |
| 485 x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>(); | 541 x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>(); |
| 486 intptr_t StartPosition = Asm->GetPosition(); | 542 intptr_t StartPosition = Asm->GetPosition(); |
| 487 assert(Var->hasReg()); | 543 assert(Var->hasReg()); |
| 488 RegX8632::XmmRegister VarReg = RegX8632::getEncodedXmm(Var->getRegNum()); | 544 RegX8632::XmmRegister VarReg = RegX8632::getEncodedXmm(Var->getRegNum()); |
| 489 if (const Variable *SrcVar = llvm::dyn_cast<Variable>(Src)) { | 545 if (const Variable *SrcVar = llvm::dyn_cast<Variable>(Src)) { |
| 490 if (SrcVar->hasReg()) { | 546 if (SrcVar->hasReg()) { |
| 491 RegX8632::XmmRegister SrcReg = | 547 RegX8632::XmmRegister SrcReg = |
| 492 RegX8632::getEncodedXmm(SrcVar->getRegNum()); | 548 RegX8632::getEncodedXmm(SrcVar->getRegNum()); |
| 493 (Asm->*(Emitter.XmmXmm))(Ty, VarReg, SrcReg); | 549 (Asm->*(Emitter.XmmXmm))(Ty, VarReg, SrcReg); |
| 494 } else { | 550 } else { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 // Ternary ops | 635 // Ternary ops |
| 580 template <> const char *InstX8632Insertps::Opcode = "insertps"; | 636 template <> const char *InstX8632Insertps::Opcode = "insertps"; |
| 581 template <> const char *InstX8632Shufps::Opcode = "shufps"; | 637 template <> const char *InstX8632Shufps::Opcode = "shufps"; |
| 582 template <> const char *InstX8632Pinsr::Opcode = "pinsr"; | 638 template <> const char *InstX8632Pinsr::Opcode = "pinsr"; |
| 583 template <> const char *InstX8632Blendvps::Opcode = "blendvps"; | 639 template <> const char *InstX8632Blendvps::Opcode = "blendvps"; |
| 584 template <> const char *InstX8632Pblendvb::Opcode = "pblendvb"; | 640 template <> const char *InstX8632Pblendvb::Opcode = "pblendvb"; |
| 585 // Three address ops | 641 // Three address ops |
| 586 template <> const char *InstX8632Pextr::Opcode = "pextr"; | 642 template <> const char *InstX8632Pextr::Opcode = "pextr"; |
| 587 template <> const char *InstX8632Pshufd::Opcode = "pshufd"; | 643 template <> const char *InstX8632Pshufd::Opcode = "pshufd"; |
| 588 | 644 |
| 645 // Inplace GPR ops |
| 646 template <> |
| 647 const x86::AssemblerX86::GPREmitterOneOp InstX8632Bswap::Emitter = { |
| 648 &x86::AssemblerX86::bswap, NULL /* only a reg form exists */}; |
| 649 template <> |
| 650 const x86::AssemblerX86::GPREmitterOneOp InstX8632Neg::Emitter = { |
| 651 &x86::AssemblerX86::neg, &x86::AssemblerX86::neg}; |
| 652 |
| 653 // Unary GPR ops |
| 654 template <> |
| 655 const x86::AssemblerX86::GPREmitterRegOp InstX8632Bsf::Emitter = { |
| 656 &x86::AssemblerX86::bsf, &x86::AssemblerX86::bsf, NULL}; |
| 657 template <> |
| 658 const x86::AssemblerX86::GPREmitterRegOp InstX8632Bsr::Emitter = { |
| 659 &x86::AssemblerX86::bsr, &x86::AssemblerX86::bsr, NULL}; |
| 660 template <> |
| 661 const x86::AssemblerX86::GPREmitterRegOp InstX8632Lea::Emitter = { |
| 662 /* reg/reg and reg/imm are illegal */ NULL, &x86::AssemblerX86::lea, NULL}; |
| 663 |
| 664 // Unary XMM ops |
| 665 template <> |
| 666 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Sqrtss::Emitter = { |
| 667 &x86::AssemblerX86::sqrtss, &x86::AssemblerX86::sqrtss, NULL}; |
| 668 |
| 589 // Binary XMM ops | 669 // Binary XMM ops |
| 590 template <> | 670 template <> |
| 591 const x86::AssemblerX86::TypedXmmEmitters InstX8632Addss::Emitter = { | 671 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Addss::Emitter = { |
| 592 &x86::AssemblerX86::addss, &x86::AssemblerX86::addss, NULL}; | 672 &x86::AssemblerX86::addss, &x86::AssemblerX86::addss, NULL}; |
| 593 template <> | 673 template <> |
| 594 const x86::AssemblerX86::TypedXmmEmitters InstX8632Addps::Emitter = { | 674 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Addps::Emitter = { |
| 595 &x86::AssemblerX86::addps, &x86::AssemblerX86::addps, NULL}; | 675 &x86::AssemblerX86::addps, &x86::AssemblerX86::addps, NULL}; |
| 596 template <> | 676 template <> |
| 597 const x86::AssemblerX86::TypedXmmEmitters InstX8632Divss::Emitter = { | 677 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Divss::Emitter = { |
| 598 &x86::AssemblerX86::divss, &x86::AssemblerX86::divss, NULL}; | 678 &x86::AssemblerX86::divss, &x86::AssemblerX86::divss, NULL}; |
| 599 template <> | 679 template <> |
| 600 const x86::AssemblerX86::TypedXmmEmitters InstX8632Divps::Emitter = { | 680 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Divps::Emitter = { |
| 601 &x86::AssemblerX86::divps, &x86::AssemblerX86::divps, NULL}; | 681 &x86::AssemblerX86::divps, &x86::AssemblerX86::divps, NULL}; |
| 602 template <> | 682 template <> |
| 603 const x86::AssemblerX86::TypedXmmEmitters InstX8632Mulss::Emitter = { | 683 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Mulss::Emitter = { |
| 604 &x86::AssemblerX86::mulss, &x86::AssemblerX86::mulss, NULL}; | 684 &x86::AssemblerX86::mulss, &x86::AssemblerX86::mulss, NULL}; |
| 605 template <> | 685 template <> |
| 606 const x86::AssemblerX86::TypedXmmEmitters InstX8632Mulps::Emitter = { | 686 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Mulps::Emitter = { |
| 607 &x86::AssemblerX86::mulps, &x86::AssemblerX86::mulps, NULL}; | 687 &x86::AssemblerX86::mulps, &x86::AssemblerX86::mulps, NULL}; |
| 608 template <> | 688 template <> |
| 609 const x86::AssemblerX86::TypedXmmEmitters InstX8632Padd::Emitter = { | 689 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Padd::Emitter = { |
| 610 &x86::AssemblerX86::padd, &x86::AssemblerX86::padd, NULL}; | 690 &x86::AssemblerX86::padd, &x86::AssemblerX86::padd, NULL}; |
| 611 template <> | 691 template <> |
| 612 const x86::AssemblerX86::TypedXmmEmitters InstX8632Pand::Emitter = { | 692 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Pand::Emitter = { |
| 613 &x86::AssemblerX86::pand, &x86::AssemblerX86::pand, NULL}; | 693 &x86::AssemblerX86::pand, &x86::AssemblerX86::pand, NULL}; |
| 614 template <> | 694 template <> |
| 615 const x86::AssemblerX86::TypedXmmEmitters InstX8632Pandn::Emitter = { | 695 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Pandn::Emitter = { |
| 616 &x86::AssemblerX86::pandn, &x86::AssemblerX86::pandn, NULL}; | 696 &x86::AssemblerX86::pandn, &x86::AssemblerX86::pandn, NULL}; |
| 617 template <> | 697 template <> |
| 618 const x86::AssemblerX86::TypedXmmEmitters InstX8632Pmuludq::Emitter = { | 698 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Pmuludq::Emitter = { |
| 619 &x86::AssemblerX86::pmuludq, &x86::AssemblerX86::pmuludq, NULL}; | 699 &x86::AssemblerX86::pmuludq, &x86::AssemblerX86::pmuludq, NULL}; |
| 620 template <> | 700 template <> |
| 621 const x86::AssemblerX86::TypedXmmEmitters InstX8632Por::Emitter = { | 701 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Por::Emitter = { |
| 622 &x86::AssemblerX86::por, &x86::AssemblerX86::por, NULL}; | 702 &x86::AssemblerX86::por, &x86::AssemblerX86::por, NULL}; |
| 623 template <> | 703 template <> |
| 624 const x86::AssemblerX86::TypedXmmEmitters InstX8632Psub::Emitter = { | 704 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Psub::Emitter = { |
| 625 &x86::AssemblerX86::psub, &x86::AssemblerX86::psub, NULL}; | 705 &x86::AssemblerX86::psub, &x86::AssemblerX86::psub, NULL}; |
| 626 template <> | 706 template <> |
| 627 const x86::AssemblerX86::TypedXmmEmitters InstX8632Pxor::Emitter = { | 707 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Pxor::Emitter = { |
| 628 &x86::AssemblerX86::pxor, &x86::AssemblerX86::pxor, NULL}; | 708 &x86::AssemblerX86::pxor, &x86::AssemblerX86::pxor, NULL}; |
| 629 template <> | 709 template <> |
| 630 const x86::AssemblerX86::TypedXmmEmitters InstX8632Sqrtss::Emitter = { | 710 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Subss::Emitter = { |
| 631 &x86::AssemblerX86::sqrtss, &x86::AssemblerX86::sqrtss, NULL}; | |
| 632 template <> | |
| 633 const x86::AssemblerX86::TypedXmmEmitters InstX8632Subss::Emitter = { | |
| 634 &x86::AssemblerX86::subss, &x86::AssemblerX86::subss, NULL}; | 711 &x86::AssemblerX86::subss, &x86::AssemblerX86::subss, NULL}; |
| 635 template <> | 712 template <> |
| 636 const x86::AssemblerX86::TypedXmmEmitters InstX8632Subps::Emitter = { | 713 const x86::AssemblerX86::XmmEmitterTwoOps InstX8632Subps::Emitter = { |
| 637 &x86::AssemblerX86::subps, &x86::AssemblerX86::subps, NULL}; | 714 &x86::AssemblerX86::subps, &x86::AssemblerX86::subps, NULL}; |
| 638 | 715 |
| 639 template <> void InstX8632Sqrtss::emit(const Cfg *Func) const { | 716 template <> void InstX8632Sqrtss::emit(const Cfg *Func) const { |
| 640 Ostream &Str = Func->getContext()->getStrEmit(); | 717 Ostream &Str = Func->getContext()->getStrEmit(); |
| 641 assert(getSrcSize() == 1); | 718 assert(getSrcSize() == 1); |
| 642 Type Ty = getSrc(0)->getType(); | 719 Type Ty = getSrc(0)->getType(); |
| 643 assert(Ty == IceType_f32 || Ty == IceType_f64); | 720 assert(Ty == IceType_f32 || Ty == IceType_f64); |
| 644 Str << "\tsqrt" << TypeX8632Attributes[Ty].SdSsString << "\t"; | 721 Str << "\tsqrt" << TypeX8632Attributes[Ty].SdSsString << "\t"; |
| 645 getDest()->emit(Func); | 722 getDest()->emit(Func); |
| 646 Str << ", "; | 723 Str << ", "; |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1118 Str << "\n"; | 1195 Str << "\n"; |
| 1119 } | 1196 } |
| 1120 | 1197 |
| 1121 void InstX8632Ucomiss::emitIAS(const Cfg *Func) const { | 1198 void InstX8632Ucomiss::emitIAS(const Cfg *Func) const { |
| 1122 assert(getSrcSize() == 2); | 1199 assert(getSrcSize() == 2); |
| 1123 // Currently src0 is always a variable by convention, to avoid having | 1200 // Currently src0 is always a variable by convention, to avoid having |
| 1124 // two memory operands. | 1201 // two memory operands. |
| 1125 assert(llvm::isa<Variable>(getSrc(0))); | 1202 assert(llvm::isa<Variable>(getSrc(0))); |
| 1126 const Variable *Src0 = llvm::cast<Variable>(getSrc(0)); | 1203 const Variable *Src0 = llvm::cast<Variable>(getSrc(0)); |
| 1127 Type Ty = Src0->getType(); | 1204 Type Ty = Src0->getType(); |
| 1128 const static x86::AssemblerX86::TypedXmmEmitters Emitter = { | 1205 const static x86::AssemblerX86::XmmEmitterTwoOps Emitter = { |
| 1129 &x86::AssemblerX86::ucomiss, &x86::AssemblerX86::ucomiss, NULL}; | 1206 &x86::AssemblerX86::ucomiss, &x86::AssemblerX86::ucomiss, NULL}; |
| 1130 emitIASVarOperandTyXMM(Func, Ty, Src0, getSrc(1), Emitter); | 1207 emitIASVarOperandTyXMM(Func, Ty, Src0, getSrc(1), Emitter); |
| 1131 } | 1208 } |
| 1132 | 1209 |
| 1133 void InstX8632Ucomiss::dump(const Cfg *Func) const { | 1210 void InstX8632Ucomiss::dump(const Cfg *Func) const { |
| 1134 Ostream &Str = Func->getContext()->getStrDump(); | 1211 Ostream &Str = Func->getContext()->getStrDump(); |
| 1135 Str << "ucomiss." << getSrc(0)->getType() << " "; | 1212 Str << "ucomiss." << getSrc(0)->getType() << " "; |
| 1136 dumpSources(Func); | 1213 dumpSources(Func); |
| 1137 } | 1214 } |
| 1138 | 1215 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 Str << "\n"; | 1370 Str << "\n"; |
| 1294 Str << ".intel_syntax\n"; | 1371 Str << ".intel_syntax\n"; |
| 1295 } else { | 1372 } else { |
| 1296 getDest()->asType(Src->getType()).emit(Func); | 1373 getDest()->asType(Src->getType()).emit(Func); |
| 1297 Str << ", "; | 1374 Str << ", "; |
| 1298 Src->emit(Func); | 1375 Src->emit(Func); |
| 1299 Str << "\n"; | 1376 Str << "\n"; |
| 1300 } | 1377 } |
| 1301 } | 1378 } |
| 1302 | 1379 |
| 1380 template <> void InstX8632Movd::emitIAS(const Cfg *Func) const { |
| 1381 x86::AssemblerX86 *Asm = Func->getAssembler<x86::AssemblerX86>(); |
| 1382 intptr_t StartPosition = Asm->GetPosition(); |
| 1383 assert(getSrcSize() == 1); |
| 1384 const Variable *Dest = getDest(); |
| 1385 const Variable *Src = llvm::cast<Variable>(getSrc(0)); |
| 1386 // For insert/extract element (one of Src/Dest is an Xmm vector and |
| 1387 // the other is an int type). |
| 1388 if (Src->getType() == IceType_i32) { |
| 1389 assert(isVectorType(Dest->getType())); |
| 1390 assert(Dest->hasReg()); |
| 1391 RegX8632::XmmRegister DestReg = RegX8632::getEncodedXmm(Dest->getRegNum()); |
| 1392 if (Src->hasReg()) { |
| 1393 Asm->movd(DestReg, RegX8632::getEncodedGPR(Src->getRegNum())); |
| 1394 } else { |
| 1395 x86::Address StackAddr(static_cast<TargetX8632 *>(Func->getTarget()) |
| 1396 ->stackVarToAsmOperand(Src)); |
| 1397 Asm->movd(DestReg, StackAddr); |
| 1398 } |
| 1399 } else { |
| 1400 assert(isVectorType(Src->getType())); |
| 1401 assert(Src->hasReg()); |
| 1402 assert(Dest->getType() == IceType_i32); |
| 1403 RegX8632::XmmRegister SrcReg = RegX8632::getEncodedXmm(Src->getRegNum()); |
| 1404 if (Dest->hasReg()) { |
| 1405 Asm->movd(RegX8632::getEncodedGPR(Dest->getRegNum()), SrcReg); |
| 1406 } else { |
| 1407 x86::Address StackAddr(static_cast<TargetX8632 *>(Func->getTarget()) |
| 1408 ->stackVarToAsmOperand(Dest)); |
| 1409 Asm->movd(StackAddr, SrcReg); |
| 1410 } |
| 1411 } |
| 1412 Ostream &Str = Func->getContext()->getStrEmit(); |
| 1413 emitIASBytes(Str, Asm, StartPosition); |
| 1414 } |
| 1415 |
| 1303 template <> void InstX8632Movp::emit(const Cfg *Func) const { | 1416 template <> void InstX8632Movp::emit(const Cfg *Func) const { |
| 1304 // TODO(wala,stichnot): movups works with all vector operands, but | 1417 // TODO(wala,stichnot): movups works with all vector operands, but |
| 1305 // there exist other instructions (movaps, movdqa, movdqu) that may | 1418 // there exist other instructions (movaps, movdqa, movdqu) that may |
| 1306 // perform better, depending on the data type and alignment of the | 1419 // perform better, depending on the data type and alignment of the |
| 1307 // operands. | 1420 // operands. |
| 1308 Ostream &Str = Func->getContext()->getStrEmit(); | 1421 Ostream &Str = Func->getContext()->getStrEmit(); |
| 1309 assert(getSrcSize() == 1); | 1422 assert(getSrcSize() == 1); |
| 1310 Str << "\tmovups\t"; | 1423 Str << "\tmovups\t"; |
| 1311 getDest()->emit(Func); | 1424 getDest()->emit(Func); |
| 1312 Str << ", "; | 1425 Str << ", "; |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 } | 1991 } |
| 1879 Str << "("; | 1992 Str << "("; |
| 1880 if (Func) | 1993 if (Func) |
| 1881 Var->dump(Func); | 1994 Var->dump(Func); |
| 1882 else | 1995 else |
| 1883 Var->dump(Str); | 1996 Var->dump(Str); |
| 1884 Str << ")"; | 1997 Str << ")"; |
| 1885 } | 1998 } |
| 1886 | 1999 |
| 1887 } // end of namespace Ice | 2000 } // end of namespace Ice |
| OLD | NEW |