| Index: src/IceTargetLoweringX8632.cpp
|
| diff --git a/src/IceTargetLoweringX8632.cpp b/src/IceTargetLoweringX8632.cpp
|
| index ea1f013553a237afb1281ea9511ea46d276332af..922007b284324e4adfb8c706fa2c0efccf347ac7 100644
|
| --- a/src/IceTargetLoweringX8632.cpp
|
| +++ b/src/IceTargetLoweringX8632.cpp
|
| @@ -897,7 +897,7 @@ void TargetX8632::addProlog(CfgNode *Node) {
|
| Var->setStackOffset(Linked->getStackOffset());
|
| }
|
|
|
| - if (ALLOW_DUMP && Func->getContext()->isVerbose(IceV_Frame)) {
|
| + if (ALLOW_DUMP && Func->isVerbose(IceV_Frame)) {
|
| OstreamLocker L(Func->getContext());
|
| Ostream &Str = Func->getContext()->getStrDump();
|
|
|
| @@ -992,7 +992,7 @@ const char *PoolTypeConverter<double>::TypeName = "double";
|
| const char *PoolTypeConverter<double>::AsmTag = ".quad";
|
| const char *PoolTypeConverter<double>::PrintfString = "0x%llx";
|
|
|
| -template <typename T> void TargetX8632::emitConstantPool() const {
|
| +template <typename T> void TargetX8632::emitConstantPool(GlobalContext *Ctx) {
|
| // Note: Still used by emit IAS.
|
| Ostream &Str = Ctx->getStrEmit();
|
| Type Ty = T::Ty;
|
| @@ -1021,7 +1021,7 @@ template <typename T> void TargetX8632::emitConstantPool() const {
|
| }
|
| }
|
|
|
| -void TargetX8632::emitConstants() const {
|
| +void TargetX8632::emitConstants(GlobalContext *Ctx) {
|
| // No need to emit constants from the int pool since (for x86) they
|
| // are embedded as immediates in the instructions, just emit float/double.
|
| if (Ctx->getFlags().UseELFWriter) {
|
| @@ -1030,8 +1030,8 @@ void TargetX8632::emitConstants() const {
|
| Writer->writeConstantPool<ConstantDouble>(IceType_f64);
|
| } else {
|
| OstreamLocker L(Ctx);
|
| - emitConstantPool<PoolTypeConverter<float>>();
|
| - emitConstantPool<PoolTypeConverter<double>>();
|
| + emitConstantPool<PoolTypeConverter<float>>(Ctx);
|
| + emitConstantPool<PoolTypeConverter<double>>(Ctx);
|
| }
|
| }
|
|
|
| @@ -3567,7 +3567,7 @@ void dumpAddressOpt(const Cfg *Func, const Variable *Base,
|
| const Inst *Reason) {
|
| if (!ALLOW_DUMP)
|
| return;
|
| - if (!Func->getContext()->isVerbose(IceV_AddrOpt))
|
| + if (!Func->isVerbose(IceV_AddrOpt))
|
| return;
|
| OstreamLocker L(Func->getContext());
|
| Ostream &Str = Func->getContext()->getStrDump();
|
| @@ -3740,7 +3740,7 @@ bool matchOffsetBase(const VariablesMetadata *VMetadata, Variable *&Base,
|
| void computeAddressOpt(Cfg *Func, const Inst *Instr, Variable *&Base,
|
| Variable *&Index, uint16_t &Shift, int32_t &Offset) {
|
| Func->resetCurrentNode();
|
| - if (Func->getContext()->isVerbose(IceV_AddrOpt)) {
|
| + if (Func->isVerbose(IceV_AddrOpt)) {
|
| OstreamLocker L(Func->getContext());
|
| Ostream &Str = Func->getContext()->getStrDump();
|
| Str << "\nStarting computeAddressOpt for instruction:\n ";
|
| @@ -4582,7 +4582,7 @@ void TargetX8632::makeRandomRegisterPermutation(
|
|
|
| assert(NumShuffled + NumPreserved == RegX8632::Reg_NUM);
|
|
|
| - if (Func->getContext()->isVerbose(IceV_Random)) {
|
| + if (Func->isVerbose(IceV_Random)) {
|
| OstreamLocker L(Func->getContext());
|
| Ostream &Str = Func->getContext()->getStrDump();
|
| Str << "Register equivalence classes:\n";
|
|
|