diff options
| author | Suraj K Suresh <kssuraj15@gmail.com> | 2020-09-28 14:48:39 +0530 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-10-03 14:17:26 +0200 |
| commit | ca27b3bc5783ce1dbda7f23883d0ddf3729902a8 (patch) | |
| tree | 7a8b2516093aafd5c1ce9f89fc3aaf833cbdc163 /executor/common.h | |
| parent | 2653fa43f8cced3279808d74e5f712bf45ef7551 (diff) | |
executor: msvc support syz-executor
Diffstat (limited to 'executor/common.h')
| -rw-r--r-- | executor/common.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/executor/common.h b/executor/common.h index 2e619065f..e054cf434 100644 --- a/executor/common.h +++ b/executor/common.h @@ -17,6 +17,13 @@ #if GOOS_freebsd || GOOS_test && HOSTGOOS_freebsd #include <sys/endian.h> // for htobe*. +#elif GOOS_windows +#define htobe16 _byteswap_ushort +#define htobe32 _byteswap_ulong +#define htobe64 _byteswap_uint64 +#define le16toh(x) x +#define htole16(x) x +typedef signed int ssize_t; #else #include <endian.h> // for htobe*. #endif @@ -30,7 +37,9 @@ #endif #if SYZ_EXECUTOR && !GOOS_linux +#if !GOOS_windows #include <unistd.h> +#endif NORETURN void doexit(int status) { _exit(status); @@ -124,13 +133,16 @@ static void install_segv_handler(void) } #define NONFAILING(...) \ - { \ + ({ \ + int ok = 1; \ __atomic_fetch_add(&skip_segv, 1, __ATOMIC_SEQ_CST); \ if (_setjmp(segv_env) == 0) { \ __VA_ARGS__; \ - } \ + } else \ + ok = 0; \ __atomic_fetch_sub(&skip_segv, 1, __ATOMIC_SEQ_CST); \ - } + ok; \ + }) #endif #endif @@ -440,12 +452,14 @@ static long syz_execute_func(volatile long text) // from the reach of the random code, otherwise it's known to reach // the output region somehow. The asm block is arch-independent except // for the number of available registers. +#if defined(__GNUC__) volatile long p[8] = {0}; (void)p; #if GOARCH_amd64 asm volatile("" ::"r"(0l), "r"(1l), "r"(2l), "r"(3l), "r"(4l), "r"(5l), "r"(6l), "r"(7l), "r"(8l), "r"(9l), "r"(10l), "r"(11l), "r"(12l), "r"(13l)); #endif +#endif ((void (*)(void))(text))(); return 0; } |