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

Implement internal method support

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1374 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2001-11-26 18:56:10 +00:00
parent dda719665b
commit d23b1d31c0
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Bytecode/Reader/ConstantReader.cpp
View File

@ -306,7 +306,8 @@ bool BytecodeParser::parseConstPoolValue(const uchar *&Buf,
BCR_TRACE(5, "Creating new forward ref variable!\n"); BCR_TRACE(5, "Creating new forward ref variable!\n");
// Create a placeholder for the global variable reference... // Create a placeholder for the global variable reference...
GlobalVariable *GVar = new GlobalVariable(PT->getValueType(), false); GlobalVariable *GVar =
new GlobalVariable(PT->getValueType(), false, true);
// Keep track of the fact that we have a forward ref to recycle it // Keep track of the fact that we have a forward ref to recycle it
GlobalRefs.insert(make_pair(make_pair(PT, Slot), GVar)); GlobalRefs.insert(make_pair(make_pair(PT, Slot), GVar));

13
lib/Bytecode/Reader/Reader.cpp
View File

@ -265,9 +265,12 @@ bool BytecodeParser::ParseMethod(const uchar *&Buf, const uchar *EndBuf,
const MethodType *MTy = dyn_cast<const MethodType>(PMTy->getValueType()); const MethodType *MTy = dyn_cast<const MethodType>(PMTy->getValueType());
if (MTy == 0) return failure(true); // Not ptr to method! if (MTy == 0) return failure(true); // Not ptr to method!
unsigned isInternal;
if (read_vbr(Buf, EndBuf, isInternal)) return failure(true);
unsigned MethSlot = MethodSignatureList.front().second; unsigned MethSlot = MethodSignatureList.front().second;
MethodSignatureList.pop_front(); MethodSignatureList.pop_front();
Method *M = new Method(MTy); Method *M = new Method(MTy, isInternal != 0);
BCR_TRACE(2, "METHOD TYPE: " << MTy << endl); BCR_TRACE(2, "METHOD TYPE: " << MTy << endl);
@ -380,8 +383,9 @@ bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End,
unsigned VarType; unsigned VarType;
if (read_vbr(Buf, End, VarType)) return failure(true); if (read_vbr(Buf, End, VarType)) return failure(true);
while (VarType != Type::VoidTyID) { // List is terminated by Void while (VarType != Type::VoidTyID) { // List is terminated by Void
// VarType Fields: bit0 = isConstant, bit1 = hasInitializer, bit2+ = slot# // VarType Fields: bit0 = isConstant, bit1 = hasInitializer,
const Type *Ty = getType(VarType >> 2); // bit2 = isInternal, bit3+ = slot#
const Type *Ty = getType(VarType >> 3);
if (!Ty || !Ty->isPointerType()) { if (!Ty || !Ty->isPointerType()) {
Error = "Global not pointer type! Ty = " + Ty->getDescription(); Error = "Global not pointer type! Ty = " + Ty->getDescription();
return failure(true); return failure(true);
@ -404,7 +408,8 @@ bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End,
} }
// Create the global variable... // Create the global variable...
GlobalVariable *GV = new GlobalVariable(ElTy, VarType & 1, Initializer); GlobalVariable *GV = new GlobalVariable(ElTy, VarType & 1, VarType & 4,
Initializer);
int DestSlot = insertValue(GV, ModuleValues); int DestSlot = insertValue(GV, ModuleValues);
if (DestSlot == -1) return failure(true); if (DestSlot == -1) return failure(true);

2
lib/Bytecode/Reader/ReaderInternals.h
View File

@ -149,7 +149,7 @@ struct BBPlaceHolderHelper : public BasicBlock {
struct MethPlaceHolderHelper : public Method { struct MethPlaceHolderHelper : public Method {
MethPlaceHolderHelper(const Type *Ty) MethPlaceHolderHelper(const Type *Ty)
: Method(cast<const MethodType>(Ty)) { : Method(cast<const MethodType>(Ty), true) {
} }
}; };

10
lib/Bytecode/Writer/Writer.cpp
View File

@ -121,9 +121,10 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
int Slot = Table.getValSlot(GV->getType()); int Slot = Table.getValSlot(GV->getType());
assert(Slot != -1 && "Module global vars is broken!"); assert(Slot != -1 && "Module global vars is broken!");
// Fields: bit0 = isConstant, bit1 = hasInitializer, bit2+ = slot# // Fields: bit0 = isConstant, bit1 = hasInitializer, bit2=InternalLinkage,
unsigned oSlot = ((unsigned)Slot << 2) | (GV->hasInitializer() << 1) | // bit3+ = slot#
GV->isConstant(); unsigned oSlot = ((unsigned)Slot << 3) | (GV->hasInternalLinkage() << 2) |
(GV->hasInitializer() << 1) | GV->isConstant();
output_vbr(oSlot, Out); output_vbr(oSlot, Out);
// If we have an initializer, output it now. // If we have an initializer, output it now.
@ -150,9 +151,10 @@ void BytecodeWriter::outputModuleInfoBlock(const Module *M) {
void BytecodeWriter::processMethod(const Method *M) { void BytecodeWriter::processMethod(const Method *M) {
BytecodeBlock MethodBlock(BytecodeFormat::Method, Out); BytecodeBlock MethodBlock(BytecodeFormat::Method, Out);
output_vbr((unsigned)M->hasInternalLinkage(), Out);
// Only output the constant pool and other goodies if needed... // Only output the constant pool and other goodies if needed...
if (!M->isExternal()) { if (!M->isExternal()) {
// Get slot information about the method... // Get slot information about the method...
Table.incorporateMethod(M); Table.incorporateMethod(M);