commit f644a4b3a36d707b32dd4b7855774a346a575e96
author Jan Voung <jvoung@chromium.org> Thu Mar 19 11:57:52 2015 -0700
committer Jan Voung <jvoung@chromium.org> Thu Mar 19 11:57:52 2015 -0700
tree 087517ee7d42322e4818914f0613ee4245898f04
parent 1c335ef464bfb1232e250c537a2f276ca5980857

Assemble calls to constant addresses.

Finally address this TODO in the assembler. This will help translate
non-IRT using programs (no ABI stability). The default scons testing
mode is non-IRT, so this helps with that. I haven't actually tested
this against scons yet, but I'm filling in the tests based on how
LLVM translates the same bitcode.

The filetype=asm is adjusted to omit the "*" and the "$".

The filetype=obj is adjusted to check for fixups with NullSymbols,
and also fill the assembler buffer at the instruction's immediate
field w/ the right constant.

The filetype=iasm is still TODO (hits an new assert in the Fixup's emit() function).

Reverts 7ad1bed99d058199a3ba246a5383458518596fbc:
"Allow stubbing of called constant addresses using command line argument."
since this is now handled (except for iasm).

BUG= https://code.google.com/p/nativeclient/issues/detail?id=4080
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1017373002

src/PNaClTranslator.cpp

diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
index f02d0cb..799ff94 100644
--- a/src/PNaClTranslator.cpp
+++ b/src/PNaClTranslator.cpp
@@ -167,7 +167,7 @@
       : NaClBitcodeParser(Cursor), Translator(Translator),
         ErrorStatus(ErrorStatus), NumErrors(0), NextDefiningFunctionID(0),
         VariableDeclarations(new Ice::VariableDeclarationList()),
-        BlockParser(nullptr), StubbedConstCallValue(nullptr) {}
+        BlockParser(nullptr) {}
 
   ~TopLevelParser() override {}
 
@@ -276,24 +276,6 @@
     createValueIDsForGlobalVars();
   }
 
-  /// Returns a defined function reference to be used in place of
-  /// called constant addresses. Returns the corresponding operand
-  /// to replace the calling address with. Reports an error if
-  /// a stub could not be found, returning the CallValue.
-  Ice::Operand *getStubbedConstCallValue(Ice::Operand *CallValue) {
-    if (StubbedConstCallValue)
-      return StubbedConstCallValue;
-    for (unsigned i = 0; i < getNumFunctionIDs(); ++i) {
-      Ice::FunctionDeclaration *Func = getFunctionByID(i);
-      if (!Func->isProto()) {
-        StubbedConstCallValue = getGlobalConstantByID(i);
-        return StubbedConstCallValue;
-      }
-    }
-    Error("Unable to find function definition to stub constant calls with");
-    return CallValue;
-  }
-
   /// Returns the number of function declarations in the bitcode file.
   unsigned getNumFunctionIDs() const { return FunctionDeclarationList.size(); }
 
@@ -383,8 +365,6 @@
   // The block parser currently being applied. Used for error
   // reporting.
   BlockParserBaseClass *BlockParser;
-  // Value to use to stub constant calls.
-  Ice::Operand *StubbedConstCallValue;
 
   bool ParseBlock(unsigned BlockID) override;
 
@@ -510,8 +490,8 @@
   raw_ostream &OldErrStream = setErrStream(Context->getStrDump());
   NaClBitcodeParser::ErrorAt(Level, Bit, Message);
   setErrStream(OldErrStream);
-  if (Level >= naclbitc::Error
-      && !Translator.getFlags().getAllowErrorRecovery())
+  if (Level >= naclbitc::Error &&
+      !Translator.getFlags().getAllowErrorRecovery())
     Fatal();
   return true;
 }
@@ -677,8 +657,8 @@
 }
 
 // Generates an error Message with the bit address prefixed to it.
-bool BlockParserBaseClass::ErrorAt(
-    naclbitc::ErrorLevel Level, uint64_t Bit, const std::string &Message) {
+bool BlockParserBaseClass::ErrorAt(naclbitc::ErrorLevel Level, uint64_t Bit,
+                                   const std::string &Message) {
   std::string Buffer;
   raw_string_ostream StrBuf(Buffer);
   // Note: If dump routines have been turned off, the error messages
@@ -2507,10 +2487,6 @@
         return;
       }
     } else {
-      if (getFlags().getStubConstantCalls() &&
-          llvm::isa<Ice::ConstantInteger32>(Callee)) {
-        Callee = Context->getStubbedConstCallValue(Callee);
-      }
       ReturnType = Context->getSimpleTypeByID(Values[2]);
     }