remove hack

[oota-llvm.git] / lib / CodeGen / MachineCodeEmitter.cpp

diff --git a/lib/CodeGen/MachineCodeEmitter.cpp b/lib/CodeGen/MachineCodeEmitter.cpp
index fdfd392237846c306ba8b009e6155309839f2600..1090d762d7ed182c6e06beeeb17aa2e37a0c4826 100644 (file)
--- a/lib/CodeGen/MachineCodeEmitter.cpp
+++ b/lib/CodeGen/MachineCodeEmitter.cpp
@@ -1,10 +1,10 @@
 //===-- MachineCodeEmitter.cpp - Implement the MachineCodeEmitter itf -----===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // This file implements the MachineCodeEmitter interface.
@@ -15,6 +15,8 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/Function.h"
 #include <fstream>
+#include <iostream>
+
 using namespace llvm;
 
 namespace {
@@ -26,14 +28,14 @@ namespace {
     void finishFunction(MachineFunction &F) {
       std::cout << "\n";
     }
-    void startFunctionStub(const Function &F, unsigned StubSize) {
-      std::cout << "\n--- Function stub for function: " << F.getName() << "\n";
+    void startFunctionStub(unsigned StubSize) {
+      std::cout << "\n--- Function stub:\n";
     }
-    void *finishFunctionStub(const Function &F) {
-      std::cout << "\n";
+    void *finishFunctionStub(const Function *F) {
+      std::cout << "\n--- End of stub for Function\n";
       return 0;
     }
-    
+
     void emitByte(unsigned char B) {
       std::cout << "0x" << std::hex << (unsigned int)B << std::dec << " ";
     }
@@ -45,19 +47,16 @@ namespace {
                 << (void*) Ptr << ") ";
     }
 
-    uint64_t getGlobalValueAddress(GlobalValue *V) { return 0; }
-    uint64_t getGlobalValueAddress(const std::string &Name) { return 0; }
+    void addRelocation(const MachineRelocation &MR) {
+      std::cout << "<relocation> ";
+    }
+
+    virtual unsigned char* allocateGlobal(unsigned size, unsigned alignment)
+    { return 0; }
+
     uint64_t getConstantPoolEntryAddress(unsigned Num) { return 0; }
     uint64_t getCurrentPCValue() { return 0; }
-
-    // forceCompilationOf - Force the compilation of the specified function, and
-    // return its address, because we REALLY need the address now.
-    //
-    // FIXME: This is JIT specific!
-    //
-    virtual uint64_t forceCompilationOf(Function *F) {
-      return 0;
-    }
+    uint64_t getCurrentPCOffset() { return 0; }
   };
 
   class FilePrinterEmitter : public MachineCodeEmitter {
@@ -66,14 +65,14 @@ namespace {
     MachineCodeEmitter &MCE;
     unsigned counter;
     unsigned values[4];
-    
+
   public:
     FilePrinterEmitter(MachineCodeEmitter &M, std::ostream &os)
       : o(os), MCE(M), counter(0) {
       openActual();
     }
-    
-    ~FilePrinterEmitter() { 
+
+    ~FilePrinterEmitter() {
       o << "\n";
       actual.close();
     }
@@ -98,14 +97,14 @@ namespace {
       MCE.emitConstantPool(MCP);
     }
 
-    void startFunctionStub(const Function &F, unsigned StubSize) {
-      MCE.startFunctionStub(F, StubSize);
+    void startFunctionStub(unsigned StubSize) {
+      MCE.startFunctionStub(StubSize);
     }
 
-    void *finishFunctionStub(const Function &F) {
+    void *finishFunctionStub(const Function *F) {
       return MCE.finishFunctionStub(F);
     }
-    
+
     void emitByte(unsigned char B) {
       MCE.emitByte(B);
       actual << B; actual.flush();
@@ -143,25 +142,21 @@ namespace {
     void emitWordAt(unsigned W, unsigned *Ptr) {
       MCE.emitWordAt(W, Ptr);
     }
-    uint64_t getGlobalValueAddress(GlobalValue *V) {
-      return MCE.getGlobalValueAddress(V);
-    }
-    uint64_t getGlobalValueAddress(const std::string &Name) {
-      return MCE.getGlobalValueAddress(Name);
-    }
     uint64_t getConstantPoolEntryAddress(unsigned Num) {
       return MCE.getConstantPoolEntryAddress(Num);
     }
+
+    virtual unsigned char* allocateGlobal(unsigned size, unsigned alignment)
+    { return MCE.allocateGlobal(size, alignment); }
+
     uint64_t getCurrentPCValue() {
       return MCE.getCurrentPCValue();
     }
-    // forceCompilationOf - Force the compilation of the specified function, and
-    // return its address, because we REALLY need the address now.
-    //
-    // FIXME: This is JIT specific!
-    //
-    virtual uint64_t forceCompilationOf(Function *F) {
-      return MCE.forceCompilationOf(F);
+    uint64_t getCurrentPCOffset() {
+      return MCE.getCurrentPCOffset();
+    }
+    void addRelocation(const MachineRelocation &MR) {
+      return MCE.addRelocation(MR);
     }
   };
 }