Changes in directory llvm/include/llvm/CodeGen:
ELFWriter.h updated: 1.12 -> 1.13
MachOWriter.h updated: 1.11 -> 1.12
---
Log message:
Removed methods which are now in the respective TargetObjInfo implementations.
---
Diffs of the changes: (+10 -191)
ELFWriter.h | 101 ++--------------------------------------------------------
MachOWriter.h | 100 ++-------------------------------------------------------
2 files changed, 10 insertions(+), 191 deletions(-)
Index: llvm/include/llvm/CodeGen/ELFWriter.h
diff -u llvm/include/llvm/CodeGen/ELFWriter.h:1.12
llvm/include/llvm/CodeGen/ELFWriter.h:1.13
--- llvm/include/llvm/CodeGen/ELFWriter.h:1.12 Wed Feb 22 10:23:43 2006
+++ llvm/include/llvm/CodeGen/ELFWriter.h Tue Jan 16 21:47:54 2007
@@ -22,6 +22,7 @@
class Mangler;
class MachineCodeEmitter;
class ELFCodeEmitter;
+ class TargetObjInfo;
/// ELFWriter - This class implements the common target-independent code for
/// writing ELF files. Targets should derive a class from this to
@@ -49,6 +50,10 @@
///
TargetMachine &TM;
+ /// Target object writer info.
+ ///
+ const TargetObjInfo *TOI;
+
/// Mang - The object used to perform name mangling for this module.
///
Mangler *Mang;
@@ -214,102 +219,6 @@
unsigned ELFHeader_e_shoff_Offset; // e_shoff in ELF header.
unsigned ELFHeader_e_shstrndx_Offset; // e_shstrndx in ELF header.
unsigned ELFHeader_e_shnum_Offset; // e_shnum in ELF header.
-
-
- // align - Emit padding into the file until the current output position is
- // aligned to the specified power of two boundary.
- static void align(DataBuffer &Output, unsigned Boundary) {
- assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
- "Must align to 2^k boundary");
- size_t Size = Output.size();
- if (Size & (Boundary-1)) {
- // Add padding to get alignment to the correct place.
- size_t Pad = Boundary-(Size & (Boundary-1));
- Output.resize(Size+Pad);
- }
- }
-
- static void outbyte(DataBuffer &Output, unsigned char X) {
- Output.push_back(X);
- }
- void outhalf(DataBuffer &Output, unsigned short X) {
- if (isLittleEndian) {
- Output.push_back(X&255);
- Output.push_back(X >> 8);
- } else {
- Output.push_back(X >> 8);
- Output.push_back(X&255);
- }
- }
- void outword(DataBuffer &Output, unsigned X) {
- if (isLittleEndian) {
- Output.push_back((X >> 0) & 255);
- Output.push_back((X >> 8) & 255);
- Output.push_back((X >> 16) & 255);
- Output.push_back((X >> 24) & 255);
- } else {
- Output.push_back((X >> 24) & 255);
- Output.push_back((X >> 16) & 255);
- Output.push_back((X >> 8) & 255);
- Output.push_back((X >> 0) & 255);
- }
- }
- void outxword(DataBuffer &Output, uint64_t X) {
- if (isLittleEndian) {
- Output.push_back(unsigned(X >> 0) & 255);
- Output.push_back(unsigned(X >> 8) & 255);
- Output.push_back(unsigned(X >> 16) & 255);
- Output.push_back(unsigned(X >> 24) & 255);
- Output.push_back(unsigned(X >> 32) & 255);
- Output.push_back(unsigned(X >> 40) & 255);
- Output.push_back(unsigned(X >> 48) & 255);
- Output.push_back(unsigned(X >> 56) & 255);
- } else {
- Output.push_back(unsigned(X >> 56) & 255);
- Output.push_back(unsigned(X >> 48) & 255);
- Output.push_back(unsigned(X >> 40) & 255);
- Output.push_back(unsigned(X >> 32) & 255);
- Output.push_back(unsigned(X >> 24) & 255);
- Output.push_back(unsigned(X >> 16) & 255);
- Output.push_back(unsigned(X >> 8) & 255);
- Output.push_back(unsigned(X >> 0) & 255);
- }
- }
- void outaddr32(DataBuffer &Output, unsigned X) {
- outword(Output, X);
- }
- void outaddr64(DataBuffer &Output, uint64_t X) {
- outxword(Output, X);
- }
- void outaddr(DataBuffer &Output, uint64_t X) {
- if (!is64Bit)
- outword(Output, (unsigned)X);
- else
- outxword(Output, X);
- }
-
- // fix functions - Replace an existing entry at an offset.
- void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
- unsigned char *P = &Output[Offset];
- P[0] = (X >> (isLittleEndian ? 0 : 8)) & 255;
- P[1] = (X >> (isLittleEndian ? 8 : 0)) & 255;
- }
-
- void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
- unsigned char *P = &Output[Offset];
- P[0] = (X >> (isLittleEndian ? 0 : 24)) & 255;
- P[1] = (X >> (isLittleEndian ? 8 : 16)) & 255;
- P[2] = (X >> (isLittleEndian ? 16 : 8)) & 255;
- P[3] = (X >> (isLittleEndian ? 24 : 0)) & 255;
- }
-
- void fixaddr(DataBuffer &Output, uint64_t X, unsigned Offset) {
- if (!is64Bit)
- fixword(Output, (unsigned)X, Offset);
- else
- assert(0 && "Emission of 64-bit data not implemented yet!");
- }
-
private:
void EmitGlobal(GlobalVariable *GV);
Index: llvm/include/llvm/CodeGen/MachOWriter.h
diff -u llvm/include/llvm/CodeGen/MachOWriter.h:1.11
llvm/include/llvm/CodeGen/MachOWriter.h:1.12
--- llvm/include/llvm/CodeGen/MachOWriter.h:1.11 Sun Jan 14 20:27:26 2007
+++ llvm/include/llvm/CodeGen/MachOWriter.h Tue Jan 16 21:47:54 2007
@@ -25,6 +25,7 @@
class Mangler;
class MachineCodeEmitter;
class MachOCodeEmitter;
+ class TargetObjInfo;
/// MachOSym - This struct contains information about each symbol that is
/// added to logical symbol table for the module. This is eventually
@@ -100,6 +101,10 @@
///
TargetMachine &TM;
+ /// Target object writer info.
+ ///
+ const TargetObjInfo *TOI;
+
/// Mang - The object used to perform name mangling for this module.
///
Mangler *Mang;
@@ -659,101 +664,6 @@
/// SymbolTable to aid in emitting the DYSYMTAB load command.
std::vector<unsigned> DynamicSymbolTable;
- // align - Emit padding into the file until the current output position is
- // aligned to the specified power of two boundary.
- static void align(DataBuffer &Output, unsigned Boundary) {
- assert(Boundary && (Boundary & (Boundary-1)) == 0 &&
- "Must align to 2^k boundary");
- size_t Size = Output.size();
- if (Size & (Boundary-1)) {
- // Add padding to get alignment to the correct place.
- size_t Pad = Boundary-(Size & (Boundary-1));
- Output.resize(Size+Pad);
- }
- }
-
- void outbyte(DataBuffer &Output, unsigned char X) {
- Output.push_back(X);
- }
- void outhalf(DataBuffer &Output, unsigned short X) {
- if (isLittleEndian) {
- Output.push_back(X&255);
- Output.push_back(X >> 8);
- } else {
- Output.push_back(X >> 8);
- Output.push_back(X&255);
- }
- }
- void outword(DataBuffer &Output, unsigned X) {
- if (isLittleEndian) {
- Output.push_back((X >> 0) & 255);
- Output.push_back((X >> 8) & 255);
- Output.push_back((X >> 16) & 255);
- Output.push_back((X >> 24) & 255);
- } else {
- Output.push_back((X >> 24) & 255);
- Output.push_back((X >> 16) & 255);
- Output.push_back((X >> 8) & 255);
- Output.push_back((X >> 0) & 255);
- }
- }
- void outxword(DataBuffer &Output, uint64_t X) {
- if (isLittleEndian) {
- Output.push_back(unsigned(X >> 0) & 255);
- Output.push_back(unsigned(X >> 8) & 255);
- Output.push_back(unsigned(X >> 16) & 255);
- Output.push_back(unsigned(X >> 24) & 255);
- Output.push_back(unsigned(X >> 32) & 255);
- Output.push_back(unsigned(X >> 40) & 255);
- Output.push_back(unsigned(X >> 48) & 255);
- Output.push_back(unsigned(X >> 56) & 255);
- } else {
- Output.push_back(unsigned(X >> 56) & 255);
- Output.push_back(unsigned(X >> 48) & 255);
- Output.push_back(unsigned(X >> 40) & 255);
- Output.push_back(unsigned(X >> 32) & 255);
- Output.push_back(unsigned(X >> 24) & 255);
- Output.push_back(unsigned(X >> 16) & 255);
- Output.push_back(unsigned(X >> 8) & 255);
- Output.push_back(unsigned(X >> 0) & 255);
- }
- }
- void outaddr32(DataBuffer &Output, unsigned X) {
- outword(Output, X);
- }
- void outaddr64(DataBuffer &Output, uint64_t X) {
- outxword(Output, X);
- }
- void outaddr(DataBuffer &Output, uint64_t X) {
- if (!is64Bit)
- outword(Output, (unsigned)X);
- else
- outxword(Output, X);
- }
- void outstring(DataBuffer &Output, std::string &S, unsigned Length) {
- unsigned len_to_copy = S.length() < Length ? S.length() : Length;
- unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0;
-
- for (unsigned i = 0; i < len_to_copy; ++i)
- outbyte(Output, S[i]);
-
- for (unsigned i = 0; i < len_to_fill; ++i)
- outbyte(Output, 0);
-
- }
- void fixhalf(DataBuffer &Output, unsigned short X, unsigned Offset) {
- unsigned char *P = &Output[Offset];
- P[0] = (X >> (isLittleEndian ? 0 : 8)) & 255;
- P[1] = (X >> (isLittleEndian ? 8 : 0)) & 255;
- }
- void fixword(DataBuffer &Output, unsigned X, unsigned Offset) {
- unsigned char *P = &Output[Offset];
- P[0] = (X >> (isLittleEndian ? 0 : 24)) & 255;
- P[1] = (X >> (isLittleEndian ? 8 : 16)) & 255;
- P[2] = (X >> (isLittleEndian ? 16 : 8)) & 255;
- P[3] = (X >> (isLittleEndian ? 24 : 0)) & 255;
- }
-
static void InitMem(const Constant *C, void *Addr, intptr_t Offset,
const TargetData *TD,
std::vector<MachineRelocation> &MRs);
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
