diff options
| -rw-r--r-- | lib/Target/CppBackend/CPPBackend.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/CppBackend/CallHandlers.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index b20319fd4e..80621c04cd 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -40,7 +40,7 @@ using namespace llvm; #include <Relooper.h> -#if 0 +#if 1 #define dump(x) fprintf(stderr, x "\n") #define dumpv(x, ...) fprintf(stderr, x "\n", __VA_ARGS__) #else @@ -1259,11 +1259,11 @@ std::string CppWriter::generateInstruction(const Instruction *I) { // forward references. So, we get the names of all the operands in advance const unsigned Ops(I->getNumOperands()); std::string* opNames = new std::string[Ops]; - dumpv("Generating instruction %s = %s (%d operands)", iName.c_str(), std::string(I->getOpcodeName()).c_str(), Ops); + //dumpv("Generating instruction %s = %s (%d operands)", iName.c_str(), std::string(I->getOpcodeName()).c_str(), Ops); for (unsigned i = 0; i < Ops; i++) { opNames[i] = getOpName(I->getOperand(i)); - dumpv(" op %d: %s", i, opNames[i].c_str()); + //dumpv(" op %d: %s", i, opNames[i].c_str()); } switch (I->getOpcode()) { diff --git a/lib/Target/CppBackend/CallHandlers.h b/lib/Target/CppBackend/CallHandlers.h index 8395d97b4f..4e1dc5123d 100644 --- a/lib/Target/CppBackend/CallHandlers.h +++ b/lib/Target/CppBackend/CallHandlers.h @@ -3,7 +3,7 @@ // Each handler needs DEF_CALL_HANDLER and SETUP_CALL_HANDLER typedef std::string (CppWriter::*CallHandler)(const CallInst*); -typedef std::map<const char *, CallHandler> CallHandlerMap; +typedef std::map<std::string, CallHandler> CallHandlerMap; CallHandlerMap *CallHandlers; // Definitions @@ -36,15 +36,15 @@ DEF_CALL_HANDLER(llvm_nacl_atomic_store_i32, { void setupCallHandlers() { CallHandlers = new CallHandlerMap; #define SETUP_CALL_HANDLER(Ident) \ - (*CallHandlers)[#Ident] = &CppWriter::CH_##Ident; + (*CallHandlers)[std::string("_") + #Ident] = &CppWriter::CH_##Ident; SETUP_CALL_HANDLER(__default__); SETUP_CALL_HANDLER(llvm_nacl_atomic_store_i32); } std::string handleCall(const CallInst *CI) { - CallHandlerMap::iterator CH = CallHandlers->find(getCppName(CI->getCalledValue()).c_str()); - if (CH == CallHandlers->end()) CH = CallHandlers->find("__default__"); + CallHandlerMap::iterator CH = CallHandlers->find(getCppName(CI->getCalledValue())); + if (CH == CallHandlers->end()) CH = CallHandlers->find("___default__"); return (this->*(CH->second))(CI); } |