diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2021-09-15 16:03:17 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2021-09-15 16:03:17 +0000 |
| commit | 11647befcbb81f2fc89c29020b4be80a251ec321 (patch) | |
| tree | 3e92a7e4d1f0d46152963f89bb8b9166bad1490b | |
| parent | 45cb7671133efa52b63f301e8439a71259abe478 (diff) | |
| download | src-11647befcbb81f2fc89c29020b4be80a251ec321.tar.gz src-11647befcbb81f2fc89c29020b4be80a251ec321.zip | |
Only define sanitizer wrappers for unsized bus space operations once.
Previously, this was defining duplicate definitions for each size.
This fixes a redundant definition warning from GCC.
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D31966
| -rw-r--r-- | sys/sys/bus_san.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/sys/bus_san.h b/sys/sys/bus_san.h index fd3c4c803675..09feb0660525 100644 --- a/sys/sys/bus_san.h +++ b/sys/sys/bus_san.h @@ -93,7 +93,7 @@ int sp##_bus_space_poke_##width(bus_space_tag_t, \ bus_space_handle_t, bus_size_t, type); -#define BUS_SAN_MISC(sp) \ +#define _BUS_SAN_MISC(sp) \ int sp##_bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, \ int, bus_space_handle_t *); \ void sp##_bus_space_unmap(bus_space_tag_t, bus_space_handle_t, \ @@ -108,14 +108,16 @@ void sp##_bus_space_barrier(bus_space_tag_t, bus_space_handle_t,\ bus_size_t, bus_size_t, int); +#define BUS_SAN_MISC(sp) \ + _BUS_SAN_MISC(sp) + #define _BUS_SAN_FUNCS(sp, width, type) \ BUS_SAN_READ(sp, width, type); \ BUS_SAN_WRITE(sp, width, type); \ BUS_SAN_SET(sp, width, type); \ BUS_SAN_COPY(sp, width, type) \ BUS_SAN_PEEK(sp, width, type); \ - BUS_SAN_POKE(sp, width, type); \ - BUS_SAN_MISC(sp); + BUS_SAN_POKE(sp, width, type) #define BUS_SAN_FUNCS(width, type) \ _BUS_SAN_FUNCS(SAN_INTERCEPTOR_PREFIX, width, type) @@ -124,6 +126,7 @@ BUS_SAN_FUNCS(1, uint8_t); BUS_SAN_FUNCS(2, uint16_t); BUS_SAN_FUNCS(4, uint32_t); BUS_SAN_FUNCS(8, uint64_t); +BUS_SAN_MISC(SAN_INTERCEPTOR_PREFIX); #ifndef SAN_RUNTIME |