6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-17 03:24:34 +00:00
Code Issues Projects Releases Wiki Activity

Last minor cleanups, this code still does not work for all cases, but it

Browse Source 
works much better than it used to.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2588 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2002-05-09 21:31:18 +00:00
parent d0c668c380
commit 3af3ba8b38
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Target/CBackend/CBackend.cpp
View File

@@ -1,14 +1,12 @@
//===-- Writer.cpp - Library for writing C files --------------------------===// //===-- Writer.cpp - Library for converting LLVM code to C ----------------===//
// //
// This library implements the functionality defined in llvm/Assembly/CWriter.h // This library implements the functionality defined in llvm/Assembly/CWriter.h
// and CLocalVars.h
// //
// TODO : Recursive types. // TODO : Recursive types.
// //
//===-----------------------------------------------------------------------==// //===-----------------------------------------------------------------------==//
#include "llvm/Assembly/CWriter.h" #include "llvm/Assembly/CWriter.h"
#include "llvm/SlotCalculator.h"
#include "llvm/Constants.h" #include "llvm/Constants.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/Module.h" #include "llvm/Module.h"
@@ -22,13 +20,12 @@
#include "llvm/iOther.h" #include "llvm/iOther.h"
#include "llvm/iOperators.h" #include "llvm/iOperators.h"
#include "llvm/SymbolTable.h" #include "llvm/SymbolTable.h"
#include "llvm/SlotCalculator.h"
#include "llvm/Support/InstVisitor.h" #include "llvm/Support/InstVisitor.h"
#include "llvm/Support/InstIterator.h" #include "llvm/Support/InstIterator.h"
#include "Support/StringExtras.h" #include "Support/StringExtras.h"
#include "Support/STLExtras.h" #include "Support/STLExtras.h"
#include <algorithm> #include <algorithm>
#include <strstream>
using std::string; using std::string;
using std::map; using std::map;
using std::ostream; using std::ostream;
@@ -188,10 +185,9 @@ static string calcTypeNameVar(const Type *Ty,
return Result + "}"; return Result + "}";
} }
case Type::PointerTyID: { case Type::PointerTyID:
return calcTypeNameVar(cast<const PointerType>(Ty)->getElementType(), return calcTypeNameVar(cast<const PointerType>(Ty)->getElementType(),
TypeNames, "*" + NameSoFar); TypeNames, "*" + NameSoFar);
}
case Type::ArrayTyID: { case Type::ArrayTyID: {
const ArrayType *ATy = cast<const ArrayType>(Ty); const ArrayType *ATy = cast<const ArrayType>(Ty);
@@ -220,14 +216,10 @@ namespace {
inline void write(Module *M) { printModule(M); } inline void write(Module *M) { printModule(M); }
ostream& printTypeVar(const Type *Ty, const string &VariableName) { ostream& printType(const Type *Ty, const string &VariableName = "") {
return Out << calcTypeNameVar(Ty, TypeNames, VariableName); return Out << calcTypeNameVar(Ty, TypeNames, VariableName);
} }
ostream& printType(const Type *Ty) {
return Out << calcTypeNameVar(Ty, TypeNames, "");
}
void writeOperand(const Value *Operand); void writeOperand(const Value *Operand);
void writeOperandInternal(const Value *Operand); void writeOperandInternal(const Value *Operand);
@@ -329,7 +321,7 @@ void CWriter::writeOperandInternal(const Value *Operand) {
} else if (const Constant *CPV = dyn_cast<const Constant>(Operand)) { } else if (const Constant *CPV = dyn_cast<const Constant>(Operand)) {
if (isa<ConstantPointerNull>(CPV)) { if (isa<ConstantPointerNull>(CPV)) {
Out << "(("; Out << "((";
printTypeVar(CPV->getType(), ""); printType(CPV->getType(), "");
Out << ")NULL)"; Out << ")NULL)";
} else } else
Out << getConstStrValue(CPV); Out << getConstStrValue(CPV);
@@ -381,7 +373,7 @@ void CWriter::printModule(Module *M) {
for (Module::const_giterator I = M->gbegin(), E = M->gend(); I != E; ++I) { for (Module::const_giterator I = M->gbegin(), E = M->gend(); I != E; ++I) {
GlobalVariable *GV = *I; GlobalVariable *GV = *I;
if (GV->hasInternalLinkage()) Out << "static "; if (GV->hasInternalLinkage()) Out << "static ";
printTypeVar(GV->getType()->getElementType(), getValueName(GV)); printType(GV->getType()->getElementType(), getValueName(GV));
if (GV->hasInitializer()) { if (GV->hasInitializer()) {
Out << " = " ; Out << " = " ;
@@ -460,14 +452,14 @@ void CWriter::printFunctionSignature(const Function *F) {
if (!F->isExternal()) { if (!F->isExternal()) {
if (!F->getArgumentList().empty()) { if (!F->getArgumentList().empty()) {
printTypeVar(F->getArgumentList().front()->getType(), printType(F->getArgumentList().front()->getType(),
getValueName(F->getArgumentList().front())); getValueName(F->getArgumentList().front()));
for (Function::ArgumentListType::const_iterator for (Function::ArgumentListType::const_iterator
I = F->getArgumentList().begin()+1, I = F->getArgumentList().begin()+1,
E = F->getArgumentList().end(); I != E; ++I) { E = F->getArgumentList().end(); I != E; ++I) {
Out << ", "; Out << ", ";
printTypeVar((*I)->getType(), getValueName(*I)); printType((*I)->getType(), getValueName(*I));
} }
} }
} else { } else {
@@ -501,7 +493,7 @@ void CWriter::printFunction(Function *F) {
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
if ((*I)->getType() != Type::VoidTy && !isInlinableInst(*I)) { if ((*I)->getType() != Type::VoidTy && !isInlinableInst(*I)) {
Out << " "; Out << " ";
printTypeVar((*I)->getType(), getValueName(*I)); printType((*I)->getType(), getValueName(*I));
Out << ";\n"; Out << ";\n";
} }

26
lib/Target/CBackend/Writer.cpp
View File

@@ -1,14 +1,12 @@
//===-- Writer.cpp - Library for writing C files --------------------------===// //===-- Writer.cpp - Library for converting LLVM code to C ----------------===//
// //
// This library implements the functionality defined in llvm/Assembly/CWriter.h // This library implements the functionality defined in llvm/Assembly/CWriter.h
// and CLocalVars.h
// //
// TODO : Recursive types. // TODO : Recursive types.
// //
//===-----------------------------------------------------------------------==// //===-----------------------------------------------------------------------==//
#include "llvm/Assembly/CWriter.h" #include "llvm/Assembly/CWriter.h"
#include "llvm/SlotCalculator.h"
#include "llvm/Constants.h" #include "llvm/Constants.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/Module.h" #include "llvm/Module.h"
@@ -22,13 +20,12 @@
#include "llvm/iOther.h" #include "llvm/iOther.h"
#include "llvm/iOperators.h" #include "llvm/iOperators.h"
#include "llvm/SymbolTable.h" #include "llvm/SymbolTable.h"
#include "llvm/SlotCalculator.h"
#include "llvm/Support/InstVisitor.h" #include "llvm/Support/InstVisitor.h"
#include "llvm/Support/InstIterator.h" #include "llvm/Support/InstIterator.h"
#include "Support/StringExtras.h" #include "Support/StringExtras.h"
#include "Support/STLExtras.h" #include "Support/STLExtras.h"
#include <algorithm> #include <algorithm>
#include <strstream>
using std::string; using std::string;
using std::map; using std::map;
using std::ostream; using std::ostream;
@@ -188,10 +185,9 @@ static string calcTypeNameVar(const Type *Ty,
return Result + "}"; return Result + "}";
} }
case Type::PointerTyID: { case Type::PointerTyID:
return calcTypeNameVar(cast<const PointerType>(Ty)->getElementType(), return calcTypeNameVar(cast<const PointerType>(Ty)->getElementType(),
TypeNames, "*" + NameSoFar); TypeNames, "*" + NameSoFar);
}
case Type::ArrayTyID: { case Type::ArrayTyID: {
const ArrayType *ATy = cast<const ArrayType>(Ty); const ArrayType *ATy = cast<const ArrayType>(Ty);
@@ -220,14 +216,10 @@ namespace {
inline void write(Module *M) { printModule(M); } inline void write(Module *M) { printModule(M); }
ostream& printTypeVar(const Type *Ty, const string &VariableName) { ostream& printType(const Type *Ty, const string &VariableName = "") {
return Out << calcTypeNameVar(Ty, TypeNames, VariableName); return Out << calcTypeNameVar(Ty, TypeNames, VariableName);
} }
ostream& printType(const Type *Ty) {
return Out << calcTypeNameVar(Ty, TypeNames, "");
}
void writeOperand(const Value *Operand); void writeOperand(const Value *Operand);
void writeOperandInternal(const Value *Operand); void writeOperandInternal(const Value *Operand);
@@ -329,7 +321,7 @@ void CWriter::writeOperandInternal(const Value *Operand) {
} else if (const Constant *CPV = dyn_cast<const Constant>(Operand)) { } else if (const Constant *CPV = dyn_cast<const Constant>(Operand)) {
if (isa<ConstantPointerNull>(CPV)) { if (isa<ConstantPointerNull>(CPV)) {
Out << "(("; Out << "((";
printTypeVar(CPV->getType(), ""); printType(CPV->getType(), "");
Out << ")NULL)"; Out << ")NULL)";
} else } else
Out << getConstStrValue(CPV); Out << getConstStrValue(CPV);
@@ -381,7 +373,7 @@ void CWriter::printModule(Module *M) {
for (Module::const_giterator I = M->gbegin(), E = M->gend(); I != E; ++I) { for (Module::const_giterator I = M->gbegin(), E = M->gend(); I != E; ++I) {
GlobalVariable *GV = *I; GlobalVariable *GV = *I;
if (GV->hasInternalLinkage()) Out << "static "; if (GV->hasInternalLinkage()) Out << "static ";
printTypeVar(GV->getType()->getElementType(), getValueName(GV)); printType(GV->getType()->getElementType(), getValueName(GV));
if (GV->hasInitializer()) { if (GV->hasInitializer()) {
Out << " = " ; Out << " = " ;
@@ -460,14 +452,14 @@ void CWriter::printFunctionSignature(const Function *F) {
if (!F->isExternal()) { if (!F->isExternal()) {
if (!F->getArgumentList().empty()) { if (!F->getArgumentList().empty()) {
printTypeVar(F->getArgumentList().front()->getType(), printType(F->getArgumentList().front()->getType(),
getValueName(F->getArgumentList().front())); getValueName(F->getArgumentList().front()));
for (Function::ArgumentListType::const_iterator for (Function::ArgumentListType::const_iterator
I = F->getArgumentList().begin()+1, I = F->getArgumentList().begin()+1,
E = F->getArgumentList().end(); I != E; ++I) { E = F->getArgumentList().end(); I != E; ++I) {
Out << ", "; Out << ", ";
printTypeVar((*I)->getType(), getValueName(*I)); printType((*I)->getType(), getValueName(*I));
} }
} }
} else { } else {
@@ -501,7 +493,7 @@ void CWriter::printFunction(Function *F) {
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
if ((*I)->getType() != Type::VoidTy && !isInlinableInst(*I)) { if ((*I)->getType() != Type::VoidTy && !isInlinableInst(*I)) {
Out << " "; Out << " ";
printTypeVar((*I)->getType(), getValueName(*I)); printType((*I)->getType(), getValueName(*I));
Out << ";\n"; Out << ";\n";
} }