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

Allow modules to have 'any' pointer size and endianness. Luckily, we had

Browse Source 
some space for extra flags, so we don't need to bump the revision number.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8118 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-08-24 13:47:36 +00:00
parent a7a35a831b
commit d445c6b64a
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,8 +498,14 @@ bool BytecodeParser::ParseVersionInfo(const unsigned char *&Buf,
if (read_vbr(Buf, EndBuf, Version)) return true; if (read_vbr(Buf, EndBuf, Version)) return true;
// Unpack version number: low four bits are for flags, top bits = version // Unpack version number: low four bits are for flags, top bits = version
isBigEndian = Version & 1; Module::Endianness Endianness;
hasLongPointers = Version & 2; Module::PointerSize PointerSize;
Endianness = (Version & 1) ? Module::BigEndian : Module::LittleEndian;
PointerSize = (Version & 2) ? Module::Pointer64 : Module::Pointer32;
bool hasNoEndianness = Version & 4;
bool hasNoPointerSize = Version & 8;
RevisionNum = Version >> 4; RevisionNum = Version >> 4;
// Default values for the current bytecode version // Default values for the current bytecode version
@ -515,11 +521,14 @@ bool BytecodeParser::ParseVersionInfo(const unsigned char *&Buf,
// //
if (Version != 14) return true; // Unknown revision 0 flags? if (Version != 14) return true; // Unknown revision 0 flags?
HasImplicitZeroInitializer = false; HasImplicitZeroInitializer = false;
isBigEndian = hasLongPointers = true; Endianness = Module::BigEndian;
PointerSize = Module::Pointer64;
hasInternalMarkerOnly = true; hasInternalMarkerOnly = true;
hasNoEndianness = hasNoPointerSize = false;
break; break;
case 1: case 1:
// Version #1 has two bit fields: isBigEndian and hasLongPointers // Version #1 has four bit fields: isBigEndian, hasLongPointers,
// hasNoEndianness, and hasNoPointerSize.
hasInternalMarkerOnly = true; hasInternalMarkerOnly = true;
break; break;
case 2: case 2:
@ -531,14 +540,14 @@ bool BytecodeParser::ParseVersionInfo(const unsigned char *&Buf,
return true; return true;
} }
TheModule->setEndianness(isBigEndian ? Module::BigEndian : if (hasNoEndianness) Endianness = Module::AnyEndianness;
Module::LittleEndian); if (hasNoPointerSize) PointerSize = Module::AnyPointerSize;
TheModule->setPointerSize(hasLongPointers ? Module::Pointer64 :
Module::Pointer32);
TheModule->setEndianness(Endianness);
TheModule->setPointerSize(PointerSize);
BCR_TRACE(1, "Bytecode Rev = " << (unsigned)RevisionNum << "\n"); BCR_TRACE(1, "Bytecode Rev = " << (unsigned)RevisionNum << "\n");
BCR_TRACE(1, "BigEndian/LongPointers = " << isBigEndian << "," BCR_TRACE(1, "Endianness/PointerSize = " << Endianness << ","
<< hasLongPointers << "\n"); << PointerSize << "\n");
BCR_TRACE(1, "HasImplicitZeroInit = " << HasImplicitZeroInitializer << "\n"); BCR_TRACE(1, "HasImplicitZeroInit = " << HasImplicitZeroInitializer << "\n");
return false; return false;
} }

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

@ -86,7 +86,6 @@ private: // All of this data is transient across calls to ParseBytecode
unsigned char RevisionNum; // The rev # itself unsigned char RevisionNum; // The rev # itself
unsigned char FirstDerivedTyID; // First variable index to use for type unsigned char FirstDerivedTyID; // First variable index to use for type
bool HasImplicitZeroInitializer; // Is entry 0 of every slot implicity zeros? bool HasImplicitZeroInitializer; // Is entry 0 of every slot implicity zeros?
bool isBigEndian, hasLongPointers;// Information about the target compiled for
bool hasInternalMarkerOnly; // Only types of linkage are intern/external bool hasInternalMarkerOnly; // Only types of linkage are intern/external
typedef std::vector<ValueList*> ValueTable; typedef std::vector<ValueList*> ValueTable;

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

@ -43,11 +43,14 @@ BytecodeWriter::BytecodeWriter(std::deque<unsigned char> &o, const Module *M)
// Emit the top level CLASS block. // Emit the top level CLASS block.
BytecodeBlock ModuleBlock(BytecodeFormat::Module, Out); BytecodeBlock ModuleBlock(BytecodeFormat::Module, Out);
bool isBigEndian = M->isBigEndian(); bool isBigEndian = M->getEndianness() == Module::BigEndian;
bool hasLongPointers = M->has64BitPointers(); bool hasLongPointers = M->getPointerSize() == Module::Pointer64;
bool hasNoEndianness = M->getEndianness() == Module::AnyEndianness;
bool hasNoPointerSize = M->getPointerSize() == Module::AnyPointerSize;
// Output the version identifier... we are currently on bytecode version #2 // Output the version identifier... we are currently on bytecode version #2
unsigned Version = (2 << 4) | isBigEndian | (hasLongPointers << 1); unsigned Version = (2 << 4) | isBigEndian | (hasLongPointers << 1) |
(hasNoEndianness << 2) | (hasNoPointerSize << 3);
output_vbr(Version, Out); output_vbr(Version, Out);
align32(Out); align32(Out);