Skip to content

Commit 63f75da

Browse files
rmalmainrmalmain
committed
fmt
1 parent 511fecd commit 63f75da

File tree

7 files changed

+41
-46
lines changed

7 files changed

+41
-46
lines changed

‎include/libafl/cpu.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int libafl_qemu_write_reg(CPUState* cpu, int reg, uint8_t* val);
2222
int libafl_qemu_read_reg(CPUState* cpu, int reg, uint8_t* val);
2323
int libafl_qemu_num_regs(CPUState* cpu);
2424
void libafl_flush_jit(void);
25-
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc);
25+
void libafl_breakpoint_invalidate(CPUState* cpu, target_ulong pc);
2626

2727
int libafl_qemu_main(void);
2828
int libafl_qemu_run(void);

‎include/libafl/gdb.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ struct libafl_custom_gdb_cmd {
88
struct libafl_custom_gdb_cmd* next;
99
};
1010

11-
void libafl_qemu_add_gdb_cmd(bool (*callback)(void*, uint8_t*, size_t), void* data);
11+
void libafl_qemu_add_gdb_cmd(bool (*callback)(void*, uint8_t*, size_t),
12+
void* data);
1213
void libafl_qemu_gdb_reply(const uint8_t* buf, size_t len);
1314
bool libafl_qemu_gdb_exec(void);

‎include/libafl/user.h

-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,3 @@ struct image_info* libafl_get_image_info(void);
3030

3131
uint64_t libafl_get_brk(void);
3232
uint64_t libafl_set_brk(uint64_t new_brk);
33-

‎libafl/cpu.c

+21-24
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#include "libafl/exit.h"
1414
#include "libafl/hook.h"
1515

16-
int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg);
16+
int gdb_write_register(CPUState* cpu, uint8_t* mem_buf, int reg);
1717

18-
static __thread GByteArray *libafl_qemu_mem_buf = NULL;
19-
static __thread CPUArchState *libafl_qemu_env;
18+
static __thread GByteArray* libafl_qemu_mem_buf = NULL;
19+
static __thread CPUArchState* libafl_qemu_env;
2020

2121
#ifndef CONFIG_USER_ONLY
2222
uint8_t* libafl_paddr2host(CPUState* cpu, hwaddr addr, bool is_write)
@@ -46,28 +46,30 @@ hwaddr libafl_qemu_current_paging_id(CPUState* cpu)
4646
}
4747
}
4848

49-
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc)
49+
void libafl_breakpoint_invalidate(CPUState* cpu, target_ulong pc)
5050
{
5151
// TODO invalidate only the virtual pages related to the TB
5252
tb_flush(cpu);
5353
}
5454
#else
55-
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc)
55+
void libafl_breakpoint_invalidate(CPUState* cpu, target_ulong pc)
5656
{
57-
mmap_lock();
58-
tb_invalidate_phys_range(pc, pc + 1);
59-
mmap_unlock();
57+
mmap_lock();
58+
tb_invalidate_phys_range(pc, pc + 1);
59+
mmap_unlock();
6060
}
6161
#endif
6262

63-
target_ulong libafl_page_from_addr(target_ulong addr) {
63+
target_ulong libafl_page_from_addr(target_ulong addr)
64+
{
6465
return addr & TARGET_PAGE_MASK;
6566
}
6667

6768
CPUState* libafl_qemu_get_cpu(int cpu_index)
6869
{
69-
CPUState *cpu;
70-
CPU_FOREACH(cpu) {
70+
CPUState* cpu;
71+
CPU_FOREACH(cpu)
72+
{
7173
if (cpu->cpu_index == cpu_index)
7274
return cpu;
7375
}
@@ -76,11 +78,9 @@ CPUState* libafl_qemu_get_cpu(int cpu_index)
7678

7779
int libafl_qemu_num_cpus(void)
7880
{
79-
CPUState *cpu;
81+
CPUState* cpu;
8082
int num = 0;
81-
CPU_FOREACH(cpu) {
82-
num++;
83-
}
83+
CPU_FOREACH(cpu) { num++; }
8484
return num;
8585
}
8686

@@ -96,7 +96,8 @@ CPUState* libafl_qemu_current_cpu(void)
9696

9797
int libafl_qemu_cpu_index(CPUState* cpu)
9898
{
99-
if (cpu) return cpu->cpu_index;
99+
if (cpu)
100+
return cpu->cpu_index;
100101
return -1;
101102
}
102103

@@ -126,16 +127,14 @@ int libafl_qemu_read_reg(CPUState* cpu, int reg, uint8_t* val)
126127

127128
int libafl_qemu_num_regs(CPUState* cpu)
128129
{
129-
CPUClass *cc = CPU_GET_CLASS(cpu);
130+
CPUClass* cc = CPU_GET_CLASS(cpu);
130131
return cc->gdb_num_core_regs;
131132
}
132133

133134
void libafl_flush_jit(void)
134135
{
135-
CPUState *cpu;
136-
CPU_FOREACH(cpu) {
137-
tb_flush(cpu);
138-
}
136+
CPUState* cpu;
137+
CPU_FOREACH(cpu) { tb_flush(cpu); }
139138
}
140139

141140
__attribute__((weak)) int libafl_qemu_main(void)
@@ -150,6 +149,4 @@ int libafl_qemu_run(void)
150149
return 1;
151150
}
152151

153-
void libafl_set_qemu_env(CPUArchState* env) {
154-
libafl_qemu_env = env;
155-
}
152+
void libafl_set_qemu_env(CPUArchState* env) { libafl_qemu_env = env; }

‎libafl/gdb.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
static struct libafl_custom_gdb_cmd* libafl_qemu_gdb_cmds;
66

7-
void libafl_qemu_add_gdb_cmd(bool (*callback)(void*, uint8_t*, size_t), void* data)
7+
void libafl_qemu_add_gdb_cmd(bool (*callback)(void*, uint8_t*, size_t),
8+
void* data)
89
{
9-
struct libafl_custom_gdb_cmd* c = malloc(sizeof(struct libafl_custom_gdb_cmd));
10+
struct libafl_custom_gdb_cmd* c =
11+
malloc(sizeof(struct libafl_custom_gdb_cmd));
1012
c->callback = callback;
1113
c->data = data;
1214
c->next = libafl_qemu_gdb_cmds;
@@ -20,11 +22,13 @@ void libafl_qemu_gdb_reply(const uint8_t* buf, size_t len)
2022
gdb_put_packet(hex_buf->str);
2123
}
2224

23-
bool libafl_qemu_gdb_exec(void) {
25+
bool libafl_qemu_gdb_exec(void)
26+
{
2427
struct libafl_custom_gdb_cmd** c = &libafl_qemu_gdb_cmds;
2528
bool recognized = false;
2629
while (*c) {
27-
recognized |= (*c)->callback((*c)->data, gdbserver_state.mem_buf->data, gdbserver_state.mem_buf->len);
30+
recognized |= (*c)->callback((*c)->data, gdbserver_state.mem_buf->data,
31+
gdbserver_state.mem_buf->len);
2832
c = &(*c)->next;
2933
}
3034
return recognized;

‎libafl/syx-snapshot/device-save.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ extern int vmstate_save(QEMUFile* f, SaveStateEntry* se, JSONWriter* vmdesc);
1616

1717
static bool libafl_restoring_devices = false;
1818

19-
bool libafl_devices_is_restoring(void) {
20-
return libafl_restoring_devices;
21-
}
19+
bool libafl_devices_is_restoring(void) { return libafl_restoring_devices; }
2220

2321
// iothread must be locked
2422
DeviceSaveState* device_save_all(void)

‎libafl/user.c

+8-12
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ static struct image_info libafl_image_info;
99

1010
extern abi_ulong target_brk, initial_target_brk;
1111

12-
void host_signal_handler(int host_sig, siginfo_t *info, void *puc);
12+
void host_signal_handler(int host_sig, siginfo_t* info, void* puc);
1313

14-
void libafl_qemu_handle_crash(int host_sig, siginfo_t *info, void *puc) {
14+
void libafl_qemu_handle_crash(int host_sig, siginfo_t* info, void* puc)
15+
{
1516
host_signal_handler(host_sig, info, puc);
1617
}
1718

@@ -22,19 +23,14 @@ void libafl_dump_core_exec(int signal)
2223
}
2324
}
2425

25-
uint64_t libafl_load_addr(void) {
26-
return libafl_image_info.load_addr;
27-
}
26+
uint64_t libafl_load_addr(void) { return libafl_image_info.load_addr; }
2827

29-
struct image_info* libafl_get_image_info(void) {
30-
return &libafl_image_info;
31-
}
28+
struct image_info* libafl_get_image_info(void) { return &libafl_image_info; }
3229

33-
uint64_t libafl_get_brk(void) {
34-
return (uint64_t)target_brk;
35-
}
30+
uint64_t libafl_get_brk(void) { return (uint64_t)target_brk; }
3631

37-
uint64_t libafl_set_brk(uint64_t new_brk) {
32+
uint64_t libafl_set_brk(uint64_t new_brk)
33+
{
3834
uint64_t old_brk = (uint64_t)target_brk;
3935
target_brk = (abi_ulong)new_brk;
4036
return old_brk;

0 commit comments

Comments
 (0)