RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-05 17:51:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[libFuzzer] use __attribute__((target("popcnt"))) only on x86_64

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@279601 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kostya Serebryany 2016-08-24 01:38:42 +00:00
parent 66489736bf
commit 0c7940eaf1
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Fuzzer/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}") set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}")
# Disable the coverage and sanitizer instrumentation for the fuzzer itself. # Disable the coverage and sanitizer instrumentation for the fuzzer itself.
set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -mpopcnt -fno-sanitize=all -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters -Werror") set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize=all -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters -Werror")
if( LLVM_USE_SANITIZE_COVERAGE ) if( LLVM_USE_SANITIZE_COVERAGE )
if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address") if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address")
message(FATAL_ERROR message(FATAL_ERROR

14
lib/Fuzzer/FuzzerInternal.h
View File

@ -26,10 +26,6 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include "FuzzerExtFunctions.h"
#include "FuzzerInterface.h"
#include "FuzzerValueBitMap.h"
// Platform detection. // Platform detection.
#ifdef __linux__ #ifdef __linux__
#define LIBFUZZER_LINUX 1 #define LIBFUZZER_LINUX 1
@ -41,6 +37,16 @@
#error "Support for your platform has not been implemented" #error "Support for your platform has not been implemented"
#endif #endif
#ifdef __x86_64
#define ATTRIBUTE_TARGET_POPCNT __attribute__((target("popcnt")))
#else
#define ATTRIBUTE_TARGET_POPCNT
#endif
#include "FuzzerExtFunctions.h"
#include "FuzzerInterface.h"
#include "FuzzerValueBitMap.h"
namespace fuzzer { namespace fuzzer {
typedef int (*UserCallback)(const uint8_t *Data, size_t Size); typedef int (*UserCallback)(const uint8_t *Data, size_t Size);

2
lib/Fuzzer/FuzzerTraceState.cpp
View File

@ -574,7 +574,7 @@ static void AddValueForStrcmp(void *caller_pc, const char *s1, const char *s2,
VP.AddValue((PC & 4095) | (LastSameByte << 12)); VP.AddValue((PC & 4095) | (LastSameByte << 12));
} }
__attribute__((target("popcnt"))) ATTRIBUTE_TARGET_POPCNT
static void AddValueForCmp(void *PCptr, uint64_t Arg1, uint64_t Arg2) { static void AddValueForCmp(void *PCptr, uint64_t Arg1, uint64_t Arg2) {
if (Arg1 == Arg2) if (Arg1 == Arg2)
return; return;

2
lib/Fuzzer/FuzzerValueBitMap.h
View File

@ -34,7 +34,7 @@ struct ValueBitMap {
// Merges 'Other' into 'this', clears 'Other', // Merges 'Other' into 'this', clears 'Other',
// returns the number of set bits in 'this'. // returns the number of set bits in 'this'.
__attribute__((target("popcnt"))) ATTRIBUTE_TARGET_POPCNT
size_t MergeFrom(ValueBitMap &Other) { size_t MergeFrom(ValueBitMap &Other) {
uintptr_t Res = 0; uintptr_t Res = 0;
for (size_t i = 0; i < kMapSizeInWords; i++) { for (size_t i = 0; i < kMapSizeInWords; i++) {