diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-09-20 14:45:25 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-09-20 14:46:58 +0200 |
| commit | 6c662d569b27b446cce09529636f0eee8b4dc02e (patch) | |
| tree | a37ce741efde43cc988251d755796a58d02e42cf /executor | |
| parent | 5adbd06eff26e9e4c15f0126199b8e6a96e84230 (diff) | |
executor: fix build
Move debug_dump_data back to executor.cc.
debug_dump_data in common_linux.h does not play well
with pkg/csource debug stripping logic. It strips a large
random piece of code since it thinks debug_dump_data
definition is actually debug_dump_data call site.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 12 | ||||
| -rw-r--r-- | executor/executor.cc | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index e8ac309c3..02c1eb82e 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -13,18 +13,6 @@ struct cover_t; static void cover_reset(cover_t* cov); #endif -static void debug_dump_data(const char* data, int length) -{ - if (!flag_debug) - return; - for (int i = 0; i < length; i++) { - debug("%02x ", data[i] & 0xff); - if (i % 16 == 15) - debug("\n"); - } - debug("\n"); -} - #if SYZ_EXECUTOR || SYZ_THREADED #include <linux/futex.h> #include <pthread.h> diff --git a/executor/executor.cc b/executor/executor.cc index ef75ed7ac..58fb42872 100644 --- a/executor/executor.cc +++ b/executor/executor.cc @@ -70,6 +70,7 @@ NORETURN PRINTF void error(const char* msg, ...); static NORETURN PRINTF void exitf(const char* msg, ...); // Print debug output, does not add \n at the end of msg as opposed to the previous functions. static PRINTF void debug(const char* msg, ...); +void debug_dump_data(const char* data, int length); static NORETURN void doexit(int status); static void receive_execute(); @@ -1311,3 +1312,15 @@ void debug(const char* msg, ...) va_end(args); fflush(stderr); } + +void debug_dump_data(const char* data, int length) +{ + if (!flag_debug) + return; + for (int i = 0; i < length; i++) { + debug("%02x ", data[i] & 0xff); + if (i % 16 == 15) + debug("\n"); + } + debug("\n"); +} |