commit 3281748ca3956af27081458f7c2daf0973ecf1fd
author Karl Schimpf <kschimpf@google.com> Mon Dec 15 09:52:26 2014 -0800
committer Karl Schimpf <kschimpf@google.com> Mon Dec 15 09:52:26 2014 -0800
tree 64ad02e6482d112543df618a456657f61e9719f3
parent 9a04c0760fe48d0003ffcc5be13f67ccd924a9a4

Simplify LLVM's APInt and APFloat for use in Subzero.

In Subzero, we only need to be able to convert 64 bit constants in
bitcode files to the corresponding Ice integer or floating type. This
CL extracts the minimal implementation needed for Subzero. The intent
of this change is to remove loading unnecessary LLVM code into
(minimal) llvm2ice.

BUG=None
R=stichnot@chromium.org

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

src/PNaClTranslator.cpp

diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
index 639c062..ccc0a1a 100644
--- a/src/PNaClTranslator.cpp
+++ b/src/PNaClTranslator.cpp
@@ -17,13 +17,14 @@
 #include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeParser.h"
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
-#include "llvm/IR/Constants.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include "IceAPInt.h"
+#include "IceAPFloat.h"
 #include "IceCfg.h"
 #include "IceCfgNode.h"
 #include "IceClFlags.h"
@@ -2186,9 +2187,8 @@
         Error(StrBuf.str());
         return;
       }
-      APInt Value(BitWidth,
-                  NaClDecodeSignRotatedValue(Values[ValCaseIndex + 2]),
-                  true);
+      Ice::APInt Value(BitWidth,
+                       NaClDecodeSignRotatedValue(Values[ValCaseIndex + 2]));
       if (isIRGenDisabled)
         continue;
       Ice::CfgNode *Label = getBranchBasicBlock(Values[ValCaseIndex + 3]);
@@ -2561,7 +2561,8 @@
     }
     if (auto IType = dyn_cast<IntegerType>(
             Context->convertToLLVMType(NextConstantType))) {
-      APInt Value(IType->getBitWidth(), NaClDecodeSignRotatedValue(Values[0]));
+      Ice::APInt Value(IType->getBitWidth(),
+                       NaClDecodeSignRotatedValue(Values[0]));
       if (Ice::Constant *C = getContext()->getConstantInt(
               NextConstantType, Value.getSExtValue())) {
         FuncParser->setNextConstantID(C);
@@ -2587,16 +2588,15 @@
     }
     switch (NextConstantType) {
     case Ice::IceType_f32: {
-      APFloat Value(APFloat::IEEEsingle,
-                    APInt(32, static_cast<uint32_t>(Values[0])));
-      FuncParser->setNextConstantID(
-          getContext()->getConstantFloat(Value.convertToFloat()));
+      const Ice::APInt IntValue(32, static_cast<uint32_t>(Values[0]));
+      float FpValue = Ice::convertAPIntToFp<int32_t, float>(IntValue);
+      FuncParser->setNextConstantID(getContext()->getConstantFloat(FpValue));
       return;
     }
     case Ice::IceType_f64: {
-      APFloat Value(APFloat::IEEEdouble, APInt(64, Values[0]));
-      FuncParser->setNextConstantID(
-          getContext()->getConstantDouble(Value.convertToDouble()));
+      const Ice::APInt IntValue(64, Values[0]);
+      double FpValue = Ice::convertAPIntToFp<uint64_t, double>(IntValue);
+      FuncParser->setNextConstantID(getContext()->getConstantDouble(FpValue));
       return;
     }
     default: {