maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Sanitizer] Fixup for r176931 for Mac and Windows 

llvm-svn: 176935
This commit is contained in:
Alexey Samsonov 2013-03-13 07:39:25 +00:00
parent 05826ed8a0
commit 91f833a413
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
View File

@ -243,7 +243,8 @@ bool MemoryMappingLayout::NextSegmentLoad(
}
bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
char filename[], uptr filename_size) {
char filename[], uptr filename_size,
uptr *protection) {
for (; current_image_ >= 0; current_image_--) {
const mach_header* hdr = _dyld_get_image_header(current_image_);
if (!hdr) continue;
@ -275,14 +276,14 @@ bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
#ifdef MH_MAGIC_64
case MH_MAGIC_64: {
if (NextSegmentLoad<LC_SEGMENT_64, struct segment_command_64>(
start, end, offset, filename, filename_size))
start, end, offset, filename, filename_size, protection))
return true;
break;
}
#endif
case MH_MAGIC: {
if (NextSegmentLoad<LC_SEGMENT, struct segment_command>(
start, end, offset, filename, filename_size))
start, end, offset, filename, filename_size, protection))
return true;
break;
}
@ -296,7 +297,7 @@ bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
bool MemoryMappingLayout::GetObjectNameAndOffset(uptr addr, uptr *offset,
char filename[],
uptr filename_size
uptr filename_size,
uptr *protection) {
return IterateForObjectNameAndOffset(addr, offset, filename, filename_size,
protection);

6
compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
View File

@ -24,7 +24,8 @@ class MemoryMappingLayout {
public:
MemoryMappingLayout() {}
bool GetObjectNameAndOffset(uptr addr, uptr *offset,
char filename[], uptr filename_size) {
char filename[], uptr filename_size,
uptr *protection) {
UNIMPLEMENTED();
}
};
@ -105,7 +106,8 @@ class MemoryMappingLayout {
# elif defined __APPLE__
template<u32 kLCSegment, typename SegmentCommand>
bool NextSegmentLoad(uptr *start, uptr *end, uptr *offset,
char filename[], uptr filename_size);
char filename[], uptr filename_size,
uptr *protection);
int current_image_;
u32 current_magic_;
u32 current_filetype_;