From d268ad6e2e6c224c688a8e2a51de706e9e6f8165 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 11 Sep 2001 23:52:11 +0000 Subject: Eliminate 'BasicNode' from InstrForest. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@551 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/TargetMachine/Sparc/Sparc.burg | 6 +++--- lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'lib/CodeGen/TargetMachine/Sparc') diff --git a/lib/CodeGen/TargetMachine/Sparc/Sparc.burg b/lib/CodeGen/TargetMachine/Sparc/Sparc.burg index b211b54ee8..a40a9bb1fb 100644 --- a/lib/CodeGen/TargetMachine/Sparc/Sparc.burg +++ b/lib/CodeGen/TargetMachine/Sparc/Sparc.burg @@ -2,10 +2,10 @@ #include #include -typedef BasicTreeNode* NODEPTR_TYPE; +typedef InstrTreeNode* NODEPTR_TYPE; #define OP_LABEL(p) ((p)->opLabel) -#define LEFT_CHILD(p) ((p)->leftChild) -#define RIGHT_CHILD(p) ((p)->rightChild) +#define LEFT_CHILD(p) ((p)->LeftChild) +#define RIGHT_CHILD(p) ((p)->RightChild) #define STATE_LABEL(p) ((p)->state) #define PANIC printf %} diff --git a/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp b/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp index 492a52f623..ca2bca6584 100644 --- a/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp +++ b/lib/CodeGen/TargetMachine/Sparc/SparcInstrSelection.cpp @@ -9,23 +9,18 @@ // 7/02/01 - Vikram Adve - Created //**************************************************************************/ +#include "llvm/CodeGen/Sparc.h" +#include "llvm/CodeGen/MachineInstr.h" +#include "llvm/CodeGen/InstrForest.h" +#include "llvm/CodeGen/InstrSelection.h" #include "llvm/Support/MathExtras.h" -#include "llvm/Type.h" #include "llvm/DerivedTypes.h" -#include "llvm/SymbolTable.h" -#include "llvm/Value.h" -#include "llvm/Instruction.h" -#include "llvm/InstrTypes.h" #include "llvm/iTerminators.h" #include "llvm/iMemory.h" #include "llvm/iOther.h" #include "llvm/BasicBlock.h" #include "llvm/Method.h" #include "llvm/ConstPoolVals.h" -#include "llvm/CodeGen/Sparc.h" -#include "llvm/CodeGen/MachineInstr.h" -#include "llvm/CodeGen/InstrForest.h" -#include "llvm/CodeGen/InstrSelection.h" //******************** Internal Data Declarations ************************/ @@ -1982,7 +1977,7 @@ GetInstructionsByRule(InstructionNode* subtreeRoot, assert(ThisIsAChainRule(ruleForNode)); assert(nts[0] && ! nts[1] && "A chain rule should have only one RHS non-terminal!"); - nextRule = burm_rule(subtreeRoot->getBasicNode()->state, nts[0]); + nextRule = burm_rule(subtreeRoot->state, nts[0]); nts = burm_nts[nextRule]; numInstr = GetInstructionsByRule(subtreeRoot, nextRule, nts,target,mvec); break; -- cgit v1.2.3-70-g09d2