merge romu and skim

This commit is contained in:
van Hauser
2020-12-18 09:33:52 +01:00
parent d07b0169cb
commit 0011f2047b
4 changed files with 334 additions and 104 deletions

View File

@ -134,6 +134,12 @@
// Little helper to access the ptr to afl->##name_buf - for use in afl_realloc.
#define AFL_BUF_PARAM(name) ((void **)&afl->name##_buf)
#ifdef WORD_SIZE_64
#define AFL_RAND_RETURN u64
#else
#define AFL_RAND_RETURN u32
#endif
extern s8 interesting_8[INTERESTING_8_LEN];
extern s16 interesting_16[INTERESTING_8_LEN + INTERESTING_16_LEN];
extern s32
@ -580,7 +586,7 @@ typedef struct afl_state {
u32 rand_cnt; /* Random number counter */
u64 rand_seed[4];
u64 rand_seed[3];
s64 init_seed;
u64 total_cal_us, /* Total calibration time (us) */
@ -1015,8 +1021,8 @@ u32 count_bits(afl_state_t *, u8 *);
u32 count_bytes(afl_state_t *, u8 *);
u32 count_non_255_bytes(afl_state_t *, u8 *);
void simplify_trace(afl_state_t *, u8 *);
void classify_counts(afl_forkserver_t *);
void init_count_class16(void);
void classify_counts(afl_forkserver_t *fsrv);
void minimize_bits(afl_state_t *, u8 *, u8 *);
#ifndef SIMPLE_FILES
u8 *describe_op(afl_state_t *, u8, size_t);
@ -1106,8 +1112,7 @@ u8 common_fuzz_cmplog_stuff(afl_state_t *afl, u8 *out_buf, u32 len);
u8 input_to_state_stage(afl_state_t *afl, u8 *orig_buf, u8 *buf, u32 len,
u64 exec_cksum);
/* xoshiro256** */
uint64_t rand_next(afl_state_t *afl);
AFL_RAND_RETURN rand_next(afl_state_t *afl);
/* probability between 0.0 and 1.0 */
double rand_next_percent(afl_state_t *afl);