| Index: src/IceInstX86BaseImpl.h
|
| diff --git a/src/IceInstX86BaseImpl.h b/src/IceInstX86BaseImpl.h
|
| index 2d9ee0f423e9363c539c724fb7ee2faa3a6b4343..9e8ed37251ec9d073c284e698c5a437376633a05 100644
|
| --- a/src/IceInstX86BaseImpl.h
|
| +++ b/src/IceInstX86BaseImpl.h
|
| @@ -1,4 +1,4 @@
|
| -//===- subzero/src/IceInstX86BaseImpl.h - Generic X86 instructions -*- C++ -*=//
|
| +//==- subzero/src/IceInstX86BaseImpl.h - Generic X86 instructions -*- C++ -*-=//
|
| //
|
| // The Subzero Code Generator
|
| //
|
| @@ -47,20 +47,20 @@ InstX86Base<Machine>::getOppositeCondition(typename Traits::Cond::BrCond Cond) {
|
|
|
| template <class Machine>
|
| InstX86FakeRMW<Machine>::InstX86FakeRMW(Cfg *Func, Operand *Data, Operand *Addr,
|
| - InstArithmetic::OpKind Op,
|
| + InstArithmetic::OpKind MyOp,
|
| Variable *Beacon)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::FakeRMW, 3, nullptr),
|
| - Op(Op) {
|
| + Op(MyOp) {
|
| this->addSource(Data);
|
| this->addSource(Addr);
|
| this->addSource(Beacon);
|
| }
|
|
|
| template <class Machine>
|
| -InstX86AdjustStack<Machine>::InstX86AdjustStack(Cfg *Func, SizeT Amount,
|
| +InstX86AdjustStack<Machine>::InstX86AdjustStack(Cfg *Func, SizeT MyAmount,
|
| Variable *Esp)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Adjuststack, 1, Esp),
|
| - Amount(Amount) {
|
| + Amount(MyAmount) {
|
| this->addSource(Esp);
|
| }
|
|
|
| @@ -103,12 +103,12 @@ IceString InstX86Label<Machine>::getName(const Cfg *Func) const {
|
|
|
| template <class Machine>
|
| InstX86Br<Machine>::InstX86Br(
|
| - Cfg *Func, const CfgNode *TargetTrue, const CfgNode *TargetFalse,
|
| - const InstX86Label<Machine> *Label,
|
| - typename InstX86Base<Machine>::Traits::Cond::BrCond Condition)
|
| + Cfg *Func, const CfgNode *MyTargetTrue, const CfgNode *MyTargetFalse,
|
| + const InstX86Label<Machine> *MyLabel,
|
| + typename InstX86Base<Machine>::Traits::Cond::BrCond MyCondition)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Br, 0, nullptr),
|
| - Condition(Condition), TargetTrue(TargetTrue), TargetFalse(TargetFalse),
|
| - Label(Label) {}
|
| + Condition(MyCondition), TargetTrue(MyTargetTrue),
|
| + TargetFalse(MyTargetFalse), Label(MyLabel) {}
|
|
|
| template <class Machine>
|
| bool InstX86Br<Machine>::optimizeBranch(const CfgNode *NextNode) {
|
| @@ -180,9 +180,9 @@ InstX86Call<Machine>::InstX86Call(Cfg *Func, Variable *Dest,
|
| template <class Machine>
|
| InstX86Cmov<Machine>::InstX86Cmov(
|
| Cfg *Func, Variable *Dest, Operand *Source,
|
| - typename InstX86Base<Machine>::Traits::Cond::BrCond Condition)
|
| + typename InstX86Base<Machine>::Traits::Cond::BrCond MyCondition)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Cmov, 2, Dest),
|
| - Condition(Condition) {
|
| + Condition(MyCondition) {
|
| // The final result is either the original Dest, or Source, so mark
|
| // both as sources.
|
| this->addSource(Dest);
|
| @@ -192,9 +192,9 @@ InstX86Cmov<Machine>::InstX86Cmov(
|
| template <class Machine>
|
| InstX86Cmpps<Machine>::InstX86Cmpps(
|
| Cfg *Func, Variable *Dest, Operand *Source,
|
| - typename InstX86Base<Machine>::Traits::Cond::CmppsCond Condition)
|
| + typename InstX86Base<Machine>::Traits::Cond::CmppsCond MyCondition)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Cmpps, 2, Dest),
|
| - Condition(Condition) {
|
| + Condition(MyCondition) {
|
| this->addSource(Dest);
|
| this->addSource(Source);
|
| }
|
| @@ -236,9 +236,9 @@ InstX86Cmpxchg8b<Machine>::InstX86Cmpxchg8b(
|
|
|
| template <class Machine>
|
| InstX86Cvt<Machine>::InstX86Cvt(Cfg *Func, Variable *Dest, Operand *Source,
|
| - CvtVariant Variant)
|
| + CvtVariant MyVariant)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Cvt, 1, Dest),
|
| - Variant(Variant) {
|
| + Variant(MyVariant) {
|
| this->addSource(Source);
|
| }
|
|
|
| @@ -301,9 +301,9 @@ InstX86StoreQ<Machine>::InstX86StoreQ(
|
| }
|
|
|
| template <class Machine>
|
| -InstX86Nop<Machine>::InstX86Nop(Cfg *Func, InstX86Nop::NopVariant Variant)
|
| +InstX86Nop<Machine>::InstX86Nop(Cfg *Func, InstX86Nop::NopVariant MyVariant)
|
| : InstX86Base<Machine>(Func, InstX86Base<Machine>::Nop, 0, nullptr),
|
| - Variant(Variant) {}
|
| + Variant(MyVariant) {}
|
|
|
| template <class Machine>
|
| InstX86Fld<Machine>::InstX86Fld(Cfg *Func, Operand *Src)
|
|
|