Remove obsolete bitcode wrapper code

We are using our own bitcode reader now, and no longer need this.

R=jvoung@chromium.org, kschimpf@google.com
BUG=cleanup

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

9 files changed, 1 insertions, 497 deletions

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e2a5c54756..76ebe9aca9 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -15,4 +15,3 @@ add_subdirectory(ExecutionEngine)
 add_subdirectory(Target)
 add_subdirectory(AsmParser)
 add_subdirectory(Archive)
-add_subdirectory(Wrap)
diff --git a/lib/Makefile b/lib/Makefile
index ac9050db7c..3a699adc8d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,7 @@ LEVEL = ..
 include $(LEVEL)/Makefile.config
 
 PARALLEL_DIRS := IR IRReader AsmParser Bitcode Archive Analysis Transforms CodeGen \
-                Target ExecutionEngine Linker MC Object Option Wrap DebugInfo
+                Target ExecutionEngine Linker MC Object Option DebugInfo
 
 ifeq ($(NACL_SANDBOX),1)
   PARALLEL_DIRS := $(filter-out Archive Linker, \
diff --git a/lib/Wrap/CMakeLists.txt b/lib/Wrap/CMakeLists.txt
deleted file mode 100644
index da44a6bb56..0000000000
--- a/lib/Wrap/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_llvm_library(LLVMWrap
-  bitcode_wrapperer.cpp
-  file_wrapper_input.cpp
-  file_wrapper_output.cpp
-  wrapper_output.cpp
-)
\ No newline at end of file
diff --git a/lib/Wrap/LLVMBuild.txt b/lib/Wrap/LLVMBuild.txt
deleted file mode 100644
index 8750711338..0000000000
--- a/lib/Wrap/LLVMBuild.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-;===- ./lib/Wrap/LLVMBuild.txt ------------------------------*- Conf -*--===;
-;
-;                     The LLVM Compiler Infrastructure
-;
-; This file is distributed under the University of Illinois Open Source
-; License. See LICENSE.TXT for details.
-;
-;===------------------------------------------------------------------------===;
-;
-; This is an LLVMBuild description file for the components in this subdirectory.
-;
-; For more information on the LLVMBuild system, please see:
-;
-;   http://llvm.org/docs/LLVMBuild.html
-;
-;===------------------------------------------------------------------------===;
-
-[component_0]
-type = Library
-name = Wrap
-parent = Libraries
diff --git a/lib/Wrap/Makefile b/lib/Wrap/Makefile
deleted file mode 100644
index 79aa2b3531..0000000000
--- a/lib/Wrap/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-##===- lib/Linker/Makefile ---------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-LIBRARYNAME = LLVMWrap
-BUILD_ARCHIVE := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/lib/Wrap/bitcode_wrapperer.cpp b/lib/Wrap/bitcode_wrapperer.cpp
deleted file mode 100644
index eeb2825793..0000000000
--- a/lib/Wrap/bitcode_wrapperer.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/* Copyright 2012 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
- */
-
-#include "llvm/Wrap/bitcode_wrapperer.h"
-
-#include <stdio.h>
-#include <sys/stat.h>
-
-using std::vector;
-
-// The number of bytes in a 32 bit integer.
-static const uint32_t kWordSize = 4;
-
-// Number of LLVM-defined fixed fields in the header.
-static const uint32_t kLLVMFields = 4;
-
-// Total number of fixed fields in the header.
-static const uint32_t kFixedFields = 7;
-
-// The magic number that must exist for bitcode wrappers.
-static const uint32_t kWrapperMagicNumber = 0x0B17C0DE;
-
-// The version number associated with a wrapper file.
-// Note: llvm currently only allows the value 0. When this changes,
-// we should consider making this a command line option.
-static const uint32_t kLLVMVersionNumber = 0;
-
-// Fields defined by Android bitcode header.
-static const uint32_t kAndroidHeaderVersion = 0;
-static const uint32_t kAndroidTargetAPI = 0;
-static const uint32_t kAndroidDefaultCompilerVersion = 0;
-static const uint32_t kAndroidDefaultOptimizationLevel = 3;
-
-// PNaCl bitcode version number.
-static const uint32_t kPnaclBitcodeVersion = 0;
-
-// Max size for variable fields. Currently only used for writing them
-// out to files (the parsing works for arbitrary sizes).
-static const size_t kMaxVariableFieldSize = 256;
-
-BitcodeWrapperer::BitcodeWrapperer(WrapperInput* infile, WrapperOutput* outfile)
-    : infile_(infile),
-      outfile_(outfile),
-      buffer_size_(0),
-      cursor_(0),
-      infile_at_eof_(false),
-      infile_bc_offset_(0),
-      wrapper_bc_offset_(0),
-      wrapper_bc_size_(0),
-      android_header_version_(kAndroidHeaderVersion),
-      android_target_api_(kAndroidTargetAPI),
-      pnacl_bc_version_(0),
-      error_(false) {
-  buffer_.resize(kBitcodeWrappererBufferSize);
-  if (IsInputBitcodeWrapper()) {
-    ParseWrapperHeader();
-  } else if (IsInputBitcodeFile()) {
-    wrapper_bc_offset_ = kWordSize * kFixedFields;
-    wrapper_bc_size_ = GetInFileSize();
-  } else {
-    fprintf(stderr, "Error: input file is not a bitcode file.\n");
-    error_ = true;
-  }
-}
-
-BitcodeWrapperer::~BitcodeWrapperer() {
-  for(size_t i = 0; i < variable_field_data_.size(); i++) {
-    delete [] variable_field_data_[i];
-  }
-}
-
-
-void BitcodeWrapperer::ClearBuffer() {
-  buffer_size_ = 0;
-  cursor_ = 0;
-  infile_at_eof_ = false;
-}
-
-bool BitcodeWrapperer::Seek(uint32_t pos) {
-  if (infile_ != NULL && infile_->Seek(pos)) {
-    ClearBuffer();
-    return true;
-  }
-  return false;
-}
-
-bool BitcodeWrapperer::CanReadWord() {
-  if (GetBufferUnreadBytes() < kWordSize) {
-    FillBuffer();
-    return GetBufferUnreadBytes() >= kWordSize;
-  } else {
-    return true;
-  }
-}
-
-void BitcodeWrapperer::FillBuffer() {
-  if (cursor_ > 0) {
-    // Before filling, move any remaining bytes to the
-    // front of the buffer. This allows us to assume
-    // that after the call to FillBuffer, readable
-    // text is contiguous.
-    if (cursor_ < buffer_size_) {
-      size_t i = 0;
-      while (cursor_ < buffer_size_) {
-        buffer_[i++] = buffer_[cursor_++];
-      }
-      cursor_ = 0;
-      buffer_size_ = i;
-    }
-  } else {
-    // Assume the buffer contents have been used,
-    // and we want to completely refill it.
-    buffer_size_ = 0;
-  }
-
-  // If we don't have an input, we can't refill the buffer at all.
-  if (infile_ == NULL) {
-    return;
-  }
-
-  // Now fill in remaining space.
-  size_t needed = buffer_.size() - buffer_size_;
-
-  while (buffer_.size() > buffer_size_) {
-    int actually_read = infile_->Read(&buffer_[buffer_size_], needed);
-    if (infile_->AtEof()) {
-      infile_at_eof_ = true;
-    }
-    if (actually_read) {
-      buffer_size_ += actually_read;
-      needed -= actually_read;
-    } else if (infile_at_eof_) {
-      break;
-    }
-  }
-}
-
-bool BitcodeWrapperer::ReadWord(uint32_t& word) {
-  if (!CanReadWord()) return false;
-  word = (((uint32_t) BufferLookahead(0)) << 0)
-      | (((uint32_t) BufferLookahead(1)) << 8)
-      | (((uint32_t) BufferLookahead(2)) << 16)
-      | (((uint32_t) BufferLookahead(3)) << 24);
-  cursor_ += kWordSize;
-  return true;
-}
-
-bool BitcodeWrapperer::WriteWord(uint32_t value) {
-  uint8_t buffer[kWordSize];
-  buffer[3] = (value >> 24) & 0xFF;
-  buffer[2] = (value >> 16) & 0xFF;
-  buffer[1] = (value >> 8)  & 0xFF;
-  buffer[0] = (value >> 0)  & 0xFF;
-  return outfile_->Write(buffer, kWordSize);
-}
-
-bool BitcodeWrapperer::WriteVariableFields() {
-  // This buffer may have to be bigger if we start using the fields
-  // for larger things.
-  uint8_t buffer[kMaxVariableFieldSize];
-  for (vector<BCHeaderField>::iterator it = header_fields_.begin();
-       it != header_fields_.end(); ++it) {
-    if (!it->Write(buffer, kMaxVariableFieldSize) ||
-        !outfile_->Write(buffer, it->GetTotalSize())) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool BitcodeWrapperer::ParseWrapperHeader() {
-  // Make sure LLVM-defined fields have been parsed
-  if (!IsInputBitcodeWrapper()) return false;
-  // Check the android/pnacl fields
-  if (!ReadWord(android_header_version_) ||
-      !ReadWord(android_target_api_) || !ReadWord(pnacl_bc_version_)) {
-    fprintf(stderr, "Error: file not long enough to contain header\n");
-    return false;
-  }
-  if (pnacl_bc_version_ != kPnaclBitcodeVersion) {
-    fprintf(stderr, "Error: bad PNaCl Bitcode version\n");
-    return false;
-  }
-  int field_data_total = wrapper_bc_offset_ - kWordSize * kFixedFields;
-  if (field_data_total > 0) {
-    // Read in the variable fields. We need to allocate space for the data.
-    int field_data_read = 0;
-
-    while (field_data_read < field_data_total) {
-      FillBuffer();
-      size_t buffer_needed = BCHeaderField::GetDataSizeFromSerialized(
-          &buffer_[cursor_]);
-      if (buffer_needed > buffer_.size()) {
-        buffer_.resize(buffer_needed +
-                       sizeof(BCHeaderField::FixedSubfield) * 2);
-        FillBuffer();
-      }
-      variable_field_data_.push_back(new uint8_t[buffer_needed]);
-
-      BCHeaderField field(BCHeaderField::kInvalid, 0,
-                          variable_field_data_.back());
-      field.Read(&buffer_[cursor_], buffer_size_);
-      header_fields_.push_back(field);
-      size_t field_size = field.GetTotalSize();
-      cursor_ += field_size;
-      field_data_read += field_size;
-      if (field_data_read > field_data_total) {
-        // We read too much data, the header is corrupted
-        fprintf(stderr, "Error: raw bitcode offset inconsistent with "
-                "variable field data\n");
-        return false;
-      }
-    }
-    Seek(0);
-  }
-  return true;
-}
-
-bool BitcodeWrapperer::IsInputBitcodeWrapper() {
-  ResetCursor();
-  // First make sure that there are enough words (LLVM header)
-  // to peek at.
-  if (GetBufferUnreadBytes() < kLLVMFields * kWordSize) {
-    FillBuffer();
-    if (GetBufferUnreadBytes() < kLLVMFields * kWordSize) return false;
-  }
-
-  // Now make sure the magic number is right.
-  uint32_t first_word;
-  if ((!ReadWord(first_word)) ||
-      (kWrapperMagicNumber != first_word)) return false;
-
-  // Make sure the version is right.
-  uint32_t second_word;
-  if ((!ReadWord(second_word)) ||
-      (kLLVMVersionNumber != second_word)) return false;
-
-  // Make sure that the offset and size (for llvm) is defined.
-  uint32_t bc_offset;
-  uint32_t bc_size;
-  if (ReadWord(bc_offset) &&
-      ReadWord(bc_size)) {
-    // Before returning, save the extracted values.
-    wrapper_bc_offset_ = bc_offset;
-    infile_bc_offset_ = bc_offset;
-    wrapper_bc_size_ = bc_size;
-    return true;
-  }
-  // If reached, unable to read wrapped header.
-  return false;
-}
-
-bool BitcodeWrapperer::IsInputBitcodeFile() {
-  ResetCursor();
-  // First make sure that there are four bytes to peek at.
-  if (GetBufferUnreadBytes() < kWordSize) {
-    FillBuffer();
-    if (GetBufferUnreadBytes() < kWordSize) return false;
-  }
-  // If reached, Check if first 4 bytes match bitcode
-  // file magic number.
-  return (BufferLookahead(0) == 'B') &&
-      (BufferLookahead(1) == 'C') &&
-      (BufferLookahead(2) == 0xc0) &&
-      (BufferLookahead(3) == 0xde);
-}
-
-bool BitcodeWrapperer::BufferCopyInToOut(uint32_t size) {
-  while (size > 0) {
-    // Be sure buffer is non-empty before writing.
-    if (0 == buffer_size_) {
-      FillBuffer();
-      if (0 == buffer_size_) {
-        return false;
-      }
-    }
-    // copy the buffer to the output file.
-    size_t block = (buffer_size_ < size) ? buffer_size_ : size;
-    if (!outfile_->Write(&buffer_[cursor_], block)) return false;
-    size -= block;
-    buffer_size_ = 0;
-  }
-  // Be sure that there isn't more bytes on the input stream.
-  FillBuffer();
-  return buffer_size_ == 0;
-}
-
-void BitcodeWrapperer::AddHeaderField(BCHeaderField* field) {
-  vector<BCHeaderField>::iterator it = header_fields_.begin();
-  for (; it != header_fields_.end(); ++it) {
-    // If this field is the same as an existing one, overwrite it.
-    if (it->getID() == field->getID()) {
-      wrapper_bc_offset_ += (field->GetTotalSize() - it->GetTotalSize());
-      *it = *field;
-      break;
-    }
-  }
-  if (it == header_fields_.end()) { // there was no match, add a new field
-    header_fields_.push_back(*field);
-    wrapper_bc_offset_ += field->GetTotalSize();
-  }
-}
-
-bool BitcodeWrapperer::WriteBitcodeWrapperHeader() {
-  return
-      // Note: This writes out the 4 word header required by llvm wrapped
-      // bitcode.
-      WriteWord(kWrapperMagicNumber) &&
-      WriteWord(kLLVMVersionNumber) &&
-      WriteWord(wrapper_bc_offset_) &&
-      WriteWord(wrapper_bc_size_) &&
-      // 2 fixed fields defined by Android
-      WriteWord(android_header_version_) &&
-      WriteWord(android_target_api_) &&
-      // PNaClBitcode version
-      WriteWord(kPnaclBitcodeVersion) &&
-      // Common variable-length fields
-      WriteVariableFields();
-}
-
-void BitcodeWrapperer::PrintWrapperHeader() {
-  if (error_) {
-    fprintf(stderr, "Error condition exists: the following"
-            "data may not be reliable\n");
-  }
-  fprintf(stderr, "Wrapper magic:\t\t%x\n", kWrapperMagicNumber);
-  fprintf(stderr, "LLVM Bitcode version:\t%d\n", kLLVMVersionNumber);
-  fprintf(stderr, "Raw bitcode offset:\t%d\n", wrapper_bc_offset_);
-  fprintf(stderr, "Raw bitcode size:\t%d\n", wrapper_bc_size_);
-  fprintf(stderr, "Android header version:\t%d\n", android_header_version_);
-  fprintf(stderr, "Android target API:\t%d\n", android_target_api_);
-  fprintf(stderr, "PNaCl bitcode version:\t%d\n", kPnaclBitcodeVersion);
-  for (size_t i = 0; i < header_fields_.size(); i++) header_fields_[i].Print();
-}
-
-bool BitcodeWrapperer::GenerateWrappedBitcodeFile() {
-  if (!error_ &&
-      WriteBitcodeWrapperHeader() &&
-      Seek(infile_bc_offset_) &&
-      BufferCopyInToOut(wrapper_bc_size_)) {
-    off_t dangling = wrapper_bc_size_ & 3;
-    if (dangling) {
-      return outfile_->Write((const uint8_t*) "\0\0\0\0", 4 - dangling);
-    }
-    return true;
-  }
-  return false;
-}
-
-bool BitcodeWrapperer::GenerateRawBitcodeFile() {
-  return !error_ && Seek(infile_bc_offset_) &&
-      BufferCopyInToOut(wrapper_bc_size_);
-}
diff --git a/lib/Wrap/file_wrapper_input.cpp b/lib/Wrap/file_wrapper_input.cpp
deleted file mode 100644
index fc592e0246..0000000000
--- a/lib/Wrap/file_wrapper_input.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2012 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
- */
-
-#include <sys/stat.h>
-#include <stdlib.h>
-
-#include "llvm/Wrap/file_wrapper_input.h"
-
-FileWrapperInput::FileWrapperInput(const std::string& name) :
-    _name(name), _at_eof(false), _size_found(false), _size(0) {
-  _file = fopen(name.c_str(), "rb");
-  if (NULL == _file) {
-    fprintf(stderr, "Unable to open: %s\n", name.c_str());
-    exit(1);
-  }
-}
-
-FileWrapperInput::~FileWrapperInput() {
-  fclose(_file);
-}
-
-size_t FileWrapperInput::Read(uint8_t* buffer, size_t wanted) {
-  size_t found = fread((char*) buffer, 1, wanted, _file);
-  if (feof(_file) || ferror(_file)) {
-    _at_eof = true;
-  }
-  return found;
-}
-
-bool FileWrapperInput::AtEof() {
-  return _at_eof;
-}
-
-off_t FileWrapperInput::Size() {
-  if (_size_found) return _size;
-  struct stat st;
-  if (0 == stat(_name.c_str(), &st)) {
-    _size_found = true;
-    _size = st.st_size;
-    return _size;
-  } else {
-    fprintf(stderr, "Unable to compute file size: %s\n", _name.c_str());
-    exit(1);
-  }
-  // NOT REACHABLE.
-  return 0;
-}
-
-bool FileWrapperInput::Seek(uint32_t pos) {
-  return 0 == fseek(_file, (long) pos, SEEK_SET);
-}
diff --git a/lib/Wrap/file_wrapper_output.cpp b/lib/Wrap/file_wrapper_output.cpp
deleted file mode 100644
index f9f126868d..0000000000
--- a/lib/Wrap/file_wrapper_output.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2012 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
- */
-
-#include "llvm/Wrap/file_wrapper_output.h"
-#include <stdlib.h>
-
-
-FileWrapperOutput::FileWrapperOutput(const std::string& name)
-    : _name(name) {
-  _file = fopen(name.c_str(), "wb");
-  if (NULL == _file) {
-    fprintf(stderr, "Unable to open: %s\n", name.c_str());
-    exit(1);
-  }
-}
-
-FileWrapperOutput::~FileWrapperOutput() {
-  fclose(_file);
-}
-
-bool FileWrapperOutput::Write(uint8_t byte) {
-  return EOF != fputc(byte, _file);
-}
-
-bool FileWrapperOutput::Write(const uint8_t* buffer, size_t buffer_size) {
-  if (!buffer) {
-    return false;
-  }
-
-  if (buffer_size > 0) {
-    return buffer_size == fwrite(buffer, 1, buffer_size, _file);
-  } else {
-    return true;
-  }
-}
diff --git a/lib/Wrap/wrapper_output.cpp b/lib/Wrap/wrapper_output.cpp
deleted file mode 100644
index 493f29efa8..0000000000
--- a/lib/Wrap/wrapper_output.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "llvm/Wrap/wrapper_output.h"
-
-bool WrapperOutput::Write(const uint8_t* buffer, size_t buffer_size) {
-  // Default implementation that uses the byte write routine.
-  for (size_t i = 0; i < buffer_size; ++i) {
-    if (!Write(buffer[i])) return false;
-  }
-  return true;
-}