[llvm-commits] CVS: llvm/lib/Bytecode/Reader/ArchiveReader.cpp ReaderWrappers.cpp

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Reader:

ArchiveReader.cpp updated: 1.16 -> 1.17
ReaderWrappers.cpp updated: 1.21 -> 1.22

---
Log message:

Use the new FileUtilities.h API for mapping a file into an address 
space


---
Diffs of the changes:  (+15 -33)

Index: llvm/lib/Bytecode/Reader/ArchiveReader.cpp
diff -u llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.16 llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.17
--- llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.16	Wed Mar 31 13:51:00 2004
+++ llvm/lib/Bytecode/Reader/ArchiveReader.cpp	Thu May 27 19:24:41 2004
@@ -19,8 +19,6 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
 #include "Support/FileUtilities.h"
-#include "Config/sys/mman.h"
-#include "Config/fcntl.h"
 #include <cstdlib>
 using namespace llvm;
 
@@ -166,25 +164,21 @@
 //
 bool llvm::ReadArchiveFile(const std::string &Filename,
                            std::vector<Module*> &Objects,std::string *ErrorStr){
-  int Length = getFileSize(Filename);
-  if (Length == -1)
-    return Error(ErrorStr, "Error getting file length!");
-
-  int FD = open(Filename.c_str(), O_RDONLY);
-  if (FD == -1)
-    return Error(ErrorStr, "Error opening file!");
-  
+  unsigned Length;
+
     // mmap in the file all at once...
-  unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ, 
-                                               MAP_PRIVATE, FD, 0);
-  if (Buffer == (unsigned char*)MAP_FAILED)
-    return Error(ErrorStr, "Error mmapping file!");
+  unsigned char *Buffer = 
+     (unsigned char*)ReadFileIntoAddressSpace(Filename, Length);
+  if (Buffer == 0) {
+    if (ErrorStr) *ErrorStr = "Error reading file '" + Filename + "'!";
+    return true;
+  }
   
   // Parse the archive files we mmap'ped in
   bool Result = ReadArchiveBuffer(Filename, Buffer, Length, Objects, ErrorStr);
   
   // Unmmap the archive...
-  munmap((char*)Buffer, Length);
+  UnmapFileFromAddressSpace(Buffer, Length);
 
   if (Result)    // Free any loaded objects
     while (!Objects.empty()) {


Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.21 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.22
--- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.21	Tue Dec 30 01:40:35 2003
+++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp	Thu May 27 19:24:41 2004
@@ -18,9 +18,7 @@
 #include "llvm/Instructions.h"
 #include "Support/FileUtilities.h"
 #include "Support/StringExtras.h"
-#include "Config/fcntl.h"
 #include "Config/unistd.h"
-#include "Config/sys/mman.h"
 #include <cerrno>
 using namespace llvm;
 
@@ -34,7 +32,7 @@
   class BytecodeFileReader : public BytecodeParser {
   private:
     unsigned char *Buffer;
-    int Length;
+    unsigned Length;
 
     BytecodeFileReader(const BytecodeFileReader&); // Do not implement
     void operator=(const BytecodeFileReader &BFR); // Do not implement
@@ -50,32 +48,22 @@
 }
 
 BytecodeFileReader::BytecodeFileReader(const std::string &Filename) {
-  Length = getFileSize(Filename);
-  if (Length == -1)
-    throw ErrnoMessage(errno, "stat '" + Filename + "'");
-
-  FDHandle FD(open(Filename.c_str(), O_RDONLY));
-  if (FD == -1)
-    throw ErrnoMessage(errno, "open '" + Filename + "'");
-
-  // mmap in the file all at once...
-  Buffer = (unsigned char*)mmap(0, Length, PROT_READ, MAP_PRIVATE, FD, 0);
-
-  if (Buffer == (unsigned char*)MAP_FAILED)
-    throw ErrnoMessage(errno, "map '" + Filename + "' into memory");
+  Buffer = (unsigned char*)ReadFileIntoAddressSpace(Filename, Length);
+  if (Buffer == 0)
+    throw "Error reading file '" + Filename + "'.";
 
   try {
     // Parse the bytecode we mmapped in
     ParseBytecode(Buffer, Length, Filename);
   } catch (...) {
-    munmap((char*)Buffer, Length);
+    UnmapFileFromAddressSpace(Buffer, Length);
     throw;
   }
 }
 
 BytecodeFileReader::~BytecodeFileReader() {
   // Unmmap the bytecode...
-  munmap((char*)Buffer, Length);
+  UnmapFileFromAddressSpace(Buffer, Length);
 }
 
 //===----------------------------------------------------------------------===//