6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 18:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Support: Use llvm::COFF::BigObjMagic

Browse Source 
Use llvm::COFF::BigObjMagic insetad of the string literal.
Also checks the version number.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217633 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rui Ueyama 2014-09-11 22:34:32 +00:00
parent f70f3d4708
commit cf9142d479
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Support/Path.cpp
View File

@ -11,9 +11,10 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Support/COFF.h"
#include "llvm/Support/Endian.h"
#include "llvm/Support/Errc.h" #include "llvm/Support/Errc.h"
#include "llvm/Support/Path.h" #include "llvm/Support/Path.h"
#include "llvm/Support/Endian.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h" #include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
@ -904,12 +905,19 @@ file_magic identify_magic(StringRef Magic) {
// COFF bigobj or short import library file // COFF bigobj or short import library file
if (Magic[1] == (char)0x00 && Magic[2] == (char)0xff && if (Magic[1] == (char)0x00 && Magic[2] == (char)0xff &&
Magic[3] == (char)0xff) { Magic[3] == (char)0xff) {
const char BigobjMagic[] = size_t MinSize = offsetof(COFF::BigObjHeader, UUID) + sizeof(COFF::BigObjMagic);
"\xc7\xa1\xba\xd1\xee\xba\xa9\x4b\xaf\x20\xfa\xf6\x6a\xa4\xdc\xb8"; if (Magic.size() < MinSize)
if (Magic.size() >= 28 && return file_magic::coff_import_library;
memcmp(Magic.data() + 12, BigobjMagic, sizeof(BigobjMagic)) == 0)
return file_magic::coff_object; int BigObjVersion = *reinterpret_cast<const support::ulittle16_t*>(
return file_magic::coff_import_library; Magic.data() + offsetof(COFF::BigObjHeader, Version));
if (BigObjVersion < COFF::BigObjHeader::MinBigObjectVersion)
return file_magic::coff_import_library;
const char *Start = Magic.data() + offsetof(COFF::BigObjHeader, UUID);
if (memcmp(Start, COFF::BigObjMagic, sizeof(COFF::BigObjMagic)) != 0)
return file_magic::coff_import_library;
return file_magic::coff_object;
} }
// Windows resource file // Windows resource file
const char Expected[] = { 0, 0, 0, 0, '\x20', 0, 0, 0, '\xff' }; const char Expected[] = { 0, 0, 0, 0, '\x20', 0, 0, 0, '\xff' };

2
unittests/Support/Path.cpp
View File

@ -483,7 +483,7 @@ TEST_F(FileSystemTest, DirectoryIteration) {
const char archive[] = "!<arch>\x0A"; const char archive[] = "!<arch>\x0A";
const char bitcode[] = "\xde\xc0\x17\x0b"; const char bitcode[] = "\xde\xc0\x17\x0b";
const char coff_object[] = "\x00\x00......"; const char coff_object[] = "\x00\x00......";
const char coff_bigobj[] = "\x00\x00\xff\xff........" const char coff_bigobj[] = "\x00\x00\xff\xff\x00\x02......"
"\xc7\xa1\xba\xd1\xee\xba\xa9\x4b\xaf\x20\xfa\xf6\x6a\xa4\xdc\xb8"; "\xc7\xa1\xba\xd1\xee\xba\xa9\x4b\xaf\x20\xfa\xf6\x6a\xa4\xdc\xb8";
const char coff_import_library[] = "\x00\x00\xff\xff...."; const char coff_import_library[] = "\x00\x00\xff\xff....";
const char elf_relocatable[] = { 0x7f, 'E', 'L', 'F', 1, 2, 1, 0, 0, const char elf_relocatable[] = { 0x7f, 'E', 'L', 'F', 1, 2, 1, 0, 0,