merge in ics-mr1-release history after reset to ics-mr1
diff --git a/bcinfo/Android.mk b/bcinfo/Android.mk
index e100e15..3ca7fd6 100644
--- a/bcinfo/Android.mk
+++ b/bcinfo/Android.mk
@@ -33,6 +33,7 @@
libbcinfo_SRC_FILES := \
BitcodeTranslator.cpp \
+ BitcodeWrapper.cpp \
MetadataExtractor.cpp
libbcinfo_C_INCLUDES := $(LOCAL_PATH)/../include
diff --git a/bcinfo/BitcodeWrapper.cpp b/bcinfo/BitcodeWrapper.cpp
new file mode 100644
index 0000000..bf7e75b
--- /dev/null
+++ b/bcinfo/BitcodeWrapper.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2011, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bcinfo/BitcodeWrapper.h"
+
+#define LOG_TAG "bcinfo"
+#include <cutils/log.h>
+
+#include "llvm/Bitcode/ReaderWriter.h"
+
+#include <cstdlib>
+#include <cstring>
+
+namespace bcinfo {
+
+BitcodeWrapper::BitcodeWrapper(const char *bitcode, size_t bitcodeSize)
+ : mFileType(BC_NOT_BC), mBitcode(bitcode),
+ mBitcodeEnd(bitcode + bitcodeSize - 1), mBitcodeSize(bitcodeSize) {
+ memset(&mBCHeader, 0, sizeof(mBCHeader));
+}
+
+
+BitcodeWrapper::~BitcodeWrapper() {
+ return;
+}
+
+
+bool BitcodeWrapper::unwrap() {
+ if (!mBitcode || !mBitcodeSize) {
+ LOGE("Invalid/empty bitcode");
+ return false;
+ }
+
+ if (llvm::isBitcodeWrapper((const unsigned char*) mBitcode,
+ (const unsigned char*) mBitcodeEnd)) {
+ if (mBitcodeSize < sizeof(mBCHeader)) {
+ LOGE("Invalid bitcode size");
+ return false;
+ }
+
+ mFileType = BC_WRAPPER;
+ memcpy(&mBCHeader, mBitcode, sizeof(mBCHeader));
+ return true;
+ } else if (llvm::isRawBitcode((const unsigned char*) mBitcode,
+ (const unsigned char*) mBitcodeEnd)) {
+ mFileType = BC_RAW;
+ return true;
+ } else {
+ LOGE("Not bitcode");
+ mFileType = BC_NOT_BC;
+ return false;
+ }
+}
+
+} // namespace bcinfo
+
diff --git a/include/bcinfo/BitcodeWrapper.h b/include/bcinfo/BitcodeWrapper.h
new file mode 100644
index 0000000..cde0a91
--- /dev/null
+++ b/include/bcinfo/BitcodeWrapper.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2011, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __ANDROID_BCINFO_BITCODEWRAPPER_H__
+#define __ANDROID_BCINFO_BITCODEWRAPPER_H__
+
+#include <cstddef>
+#include <stdint.h>
+
+namespace bcinfo {
+
+struct BCWrapperHeader {
+ uint32_t Magic;
+ uint32_t Version;
+ uint32_t BitcodeOffset;
+ uint32_t BitcodeSize;
+ uint32_t HeaderVersion;
+ uint32_t TargetAPI;
+};
+
+enum BCFileType {
+ BC_NOT_BC = 0,
+ BC_WRAPPER = 1,
+ BC_RAW = 2
+};
+
+class BitcodeWrapper {
+ private:
+ enum BCFileType mFileType;
+ const char *mBitcode;
+ const char *mBitcodeEnd;
+ size_t mBitcodeSize;
+
+ struct BCWrapperHeader mBCHeader;
+
+ public:
+ /**
+ * Reads wrapper information from \p bitcode.
+ *
+ * \param bitcode - input bitcode string.
+ * \param bitcodeSize - length of \p bitcode string (in bytes).
+ */
+ BitcodeWrapper(const char *bitcode, size_t bitcodeSize);
+
+ ~BitcodeWrapper();
+
+ /**
+ * Attempt to unwrap the target bitcode.
+ *
+ * \return true on success and false if an error occurred.
+ */
+ bool unwrap();
+
+ /**
+ * \return type of bitcode file.
+ */
+ enum BCFileType getBCFileType() const {
+ return mFileType;
+ }
+
+ /**
+ * \return header version of bitcode wrapper. This can only be 0 currently.
+ */
+ uint32_t getHeaderVersion() const {
+ return mBCHeader.HeaderVersion;
+ }
+
+ /**
+ * \return target API version of this script.
+ */
+ uint32_t getTargetAPI() const {
+ return mBCHeader.TargetAPI;
+ }
+};
+
+} // namespace bcinfo
+
+#endif // __ANDROID_BCINFO_BITCODEWRAPPER_H__
