6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix memory leaks for external symbol name strings.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100601 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sanjiv Gupta 2010-04-07 03:36:01 +00:00
parent b1fb4497b0
commit d49baefaad
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Target/PIC16/PIC16.h
View File

@ -21,6 +21,7 @@
#include <sstream>
#include <cstring>
#include <string>
#include <vector>
namespace llvm {
class PIC16TargetMachine;
@ -52,17 +53,34 @@ namespace PIC16CC {
UDATA_SHR
};
class ESNames {
std::vector<char*> stk;
ESNames() {}
public:
~ESNames() {
std::vector<char*>::iterator it = stk.end();
it--;
while(stk.end() != stk.begin())
{
char* p = *it;
delete [] p;
it--;
stk.pop_back();
}
}
// External symbol names require memory to live till the program end.
// So we have to allocate it and keep.
// FIXME: Don't leak the allocated strings.
inline static const char *createESName (const std::string &name) {
char *tmpName = new char[name.size() + 1];
memcpy(tmpName, name.c_str(), name.size() + 1);
return tmpName;
}
// External symbol names require memory to live till the program end.
// So we have to allocate it and keep. Push all such allocations into a
// vector so that they get freed up on termination.
inline static const char *createESName (const std::string &name) {
static ESNames esn;
char *tmpName = new char[name.size() + 1];
memcpy(tmpName, name.c_str(), name.size() + 1);
esn.stk.push_back(tmpName);
return tmpName;
}
};
inline static const char *PIC16CondCodeToString(PIC16CC::CondCodes CC) {
switch (CC) {

18
lib/Target/PIC16/PIC16ISelLowering.cpp
View File

@ -116,7 +116,7 @@ static const char *getIntrinsicName(unsigned opcode) {
std::string Fullname = prefix + tagname + Basename;
// The name has to live through program life.
return createESName(Fullname);
return ESNames::createESName(Fullname);
}
// getStdLibCallName - Get the name for the standard library function.
@ -139,7 +139,7 @@ static const char *getStdLibCallName(unsigned opcode) {
std::string LibCallName = prefix + BaseName;
// The name has to live through program life.
return createESName(LibCallName);
return ESNames::createESName(LibCallName);
}
// PIC16TargetLowering Constructor.
@ -737,7 +737,7 @@ PIC16TargetLowering::LegalizeFrameIndex(SDValue Op, SelectionDAG &DAG,
unsigned FIndex = FR->getIndex();
const char *tmpName;
if (FIndex < ReservedFrameCount) {
tmpName = createESName(PAN::getFrameLabel(Name));
tmpName = ESNames::createESName(PAN::getFrameLabel(Name));
ES = DAG.getTargetExternalSymbol(tmpName, MVT::i8);
Offset = 0;
for (unsigned i=0; i<FIndex ; ++i) {
@ -745,7 +745,7 @@ PIC16TargetLowering::LegalizeFrameIndex(SDValue Op, SelectionDAG &DAG,
}
} else {
// FrameIndex has been made for some temporary storage
tmpName = createESName(PAN::getTempdataLabel(Name));
tmpName = ESNames::createESName(PAN::getTempdataLabel(Name));
ES = DAG.getTargetExternalSymbol(tmpName, MVT::i8);
Offset = GetTmpOffsetForFI(FIndex, MFI->getObjectSize(FIndex));
}
@ -1077,7 +1077,7 @@ SDValue PIC16TargetLowering::ConvertToMemOperand(SDValue Op,
// Put the value on stack.
// Get a stack slot index and convert to es.
int FI = MF.getFrameInfo()->CreateStackObject(1, 1, false);
const char *tmpName = createESName(PAN::getTempdataLabel(FuncName));
const char *tmpName = ESNames::createESName(PAN::getTempdataLabel(FuncName));
SDValue ES = DAG.getTargetExternalSymbol(tmpName, MVT::i8);
// Store the value to ES.
@ -1275,7 +1275,7 @@ PIC16TargetLowering::LowerReturn(SDValue Chain,
const Function *F = MF.getFunction();
std::string FuncName = F->getName();
const char *tmpName = createESName(PAN::getFrameLabel(FuncName));
const char *tmpName = ESNames::createESName(PAN::getFrameLabel(FuncName));
SDValue ES = DAG.getTargetExternalSymbol(tmpName, MVT::i8);
SDValue BS = DAG.getConstant(1, MVT::i8);
SDValue RetVal;
@ -1419,11 +1419,11 @@ PIC16TargetLowering::LowerCall(SDValue Chain, SDValue Callee,
}
// Label for argument passing
const char *argFrame = createESName(PAN::getArgsLabel(Name));
const char *argFrame = ESNames::createESName(PAN::getArgsLabel(Name));
ArgLabel = DAG.getTargetExternalSymbol(argFrame, MVT::i8);
// Label for reading return value
const char *retName = createESName(PAN::getRetvalLabel(Name));
const char *retName = ESNames::createESName(PAN::getRetvalLabel(Name));
RetLabel = DAG.getTargetExternalSymbol(retName, MVT::i8);
} else {
// if indirect call
@ -1683,7 +1683,7 @@ PIC16TargetLowering::LowerFormalArguments(SDValue Chain,
InitReservedFrameCount(F);
// Create the <fname>.args external symbol.
const char *tmpName = createESName(PAN::getArgsLabel(FuncName));
const char *tmpName = ESNames::createESName(PAN::getArgsLabel(FuncName));
SDValue ES = DAG.getTargetExternalSymbol(tmpName, MVT::i8);
// Load arg values from the label + offset.

4
lib/Target/PIC16/PIC16InstrInfo.cpp
View File

@ -78,7 +78,7 @@ void PIC16InstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
const Function *Func = MBB.getParent()->getFunction();
const std::string FuncName = Func->getName();
const char *tmpName = createESName(PAN::getTempdataLabel(FuncName));
const char *tmpName = ESNames::createESName(PAN::getTempdataLabel(FuncName));
// On the order of operands here: think "movwf SrcReg, tmp_slot, offset".
if (RC == PIC16::GPRRegisterClass) {
@ -120,7 +120,7 @@ void PIC16InstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
const Function *Func = MBB.getParent()->getFunction();
const std::string FuncName = Func->getName();
const char *tmpName = createESName(PAN::getTempdataLabel(FuncName));
const char *tmpName = ESNames::createESName(PAN::getTempdataLabel(FuncName));
// On the order of operands here: think "movf FrameIndex, W".
if (RC == PIC16::GPRRegisterClass) {