From ae87d0864972538419e5bca554d79417d94531dd Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Mon, 29 Dec 2025 21:36:11 -0500 Subject: [PATCH] Remove defined value from header guards In https://github.com/llvm/llvm-project/pull/137112 clang-format changed its behavior to only recognize header guards with empty defines, breaking our formatting. We solve that by removing the superfluous "1" value from our header guard defines. Fixes #7757 --- api/docs/tutorial.dox | 4 ++-- clients/drcachesim/analysis_tool.h | 2 +- clients/drcachesim/analyzer.h | 2 +- clients/drcachesim/analyzer_multi.h | 2 +- clients/drcachesim/common/archive_istream.h | 4 ++-- clients/drcachesim/common/archive_ostream.h | 4 ++-- clients/drcachesim/common/crc32c.h | 4 ++-- clients/drcachesim/common/directory_iterator.h | 4 ++-- clients/drcachesim/common/gzip_istream.h | 4 ++-- clients/drcachesim/common/gzip_ostream.h | 4 ++-- clients/drcachesim/common/lz4_istream.h | 4 ++-- clients/drcachesim/common/lz4_ostream.h | 4 ++-- clients/drcachesim/common/memref.h | 2 +- clients/drcachesim/common/memtrace_stream.h | 2 +- clients/drcachesim/common/mutex_dbg_owned.h | 4 ++-- clients/drcachesim/common/named_pipe.h | 4 ++-- clients/drcachesim/common/options.h | 2 +- clients/drcachesim/common/schedule_file.h | 4 ++-- clients/drcachesim/common/snappy_consts.h | 4 ++-- clients/drcachesim/common/snappy_istream.h | 4 ++-- clients/drcachesim/common/trace_entry.h | 2 +- clients/drcachesim/common/utils.h | 4 ++-- clients/drcachesim/common/zipfile_istream.h | 4 ++-- clients/drcachesim/common/zipfile_ostream.h | 4 ++-- clients/drcachesim/common/zlib_istream.h | 4 ++-- clients/drcachesim/drpt2trace/drir.h | 4 ++-- clients/drcachesim/drpt2trace/elf_loader.h | 4 ++-- clients/drcachesim/drpt2trace/ir2trace.h | 4 ++-- clients/drcachesim/drpt2trace/pt2ir.h | 4 ++-- clients/drcachesim/reader/compressed_file_reader.h | 4 ++-- clients/drcachesim/reader/config_reader.h | 4 ++-- clients/drcachesim/reader/file_reader.h | 2 +- clients/drcachesim/reader/ipc_reader.h | 4 ++-- clients/drcachesim/reader/lz4_file_reader.h | 4 ++-- clients/drcachesim/reader/reader.h | 4 ++-- clients/drcachesim/reader/reader_base.h | 2 +- clients/drcachesim/reader/record_file_reader.h | 4 ++-- clients/drcachesim/reader/snappy_file_reader.h | 4 ++-- clients/drcachesim/reader/v2p_reader.h | 4 ++-- clients/drcachesim/reader/zipfile_file_reader.h | 4 ++-- clients/drcachesim/scheduler/flexible_queue.h | 4 ++-- clients/drcachesim/scheduler/noise_generator.h | 4 ++-- clients/drcachesim/scheduler/scheduler.h | 2 +- clients/drcachesim/scheduler/scheduler_impl.h | 2 +- clients/drcachesim/scheduler/speculator.h | 4 ++-- clients/drcachesim/simulator/cache.h | 4 ++-- clients/drcachesim/simulator/cache_line.h | 4 ++-- clients/drcachesim/simulator/cache_miss_analyzer.h | 4 ++-- clients/drcachesim/simulator/cache_replacement_policy.h | 4 ++-- clients/drcachesim/simulator/cache_simulator.h | 2 +- clients/drcachesim/simulator/cache_simulator_create.h | 4 ++-- clients/drcachesim/simulator/cache_stats.h | 4 ++-- clients/drcachesim/simulator/caching_device.h | 4 ++-- clients/drcachesim/simulator/caching_device_block.h | 4 ++-- clients/drcachesim/simulator/caching_device_stats.h | 2 +- .../drcachesim/simulator/create_cache_replacement_policy.h | 4 ++-- clients/drcachesim/simulator/prefetcher.h | 4 ++-- clients/drcachesim/simulator/simulator.h | 2 +- clients/drcachesim/simulator/snoop_filter.h | 4 ++-- clients/drcachesim/simulator/tlb.h | 4 ++-- clients/drcachesim/simulator/tlb_entry.h | 4 ++-- clients/drcachesim/simulator/tlb_simulator.h | 4 ++-- clients/drcachesim/simulator/tlb_simulator_create.h | 4 ++-- clients/drcachesim/simulator/tlb_stats.h | 4 ++-- clients/drcachesim/tests/cache_replacement_policy_unit_test.h | 4 ++-- clients/drcachesim/tests/config_reader_unit_test.h | 4 ++-- clients/drcachesim/tests/memref_gen.h | 2 +- clients/drcachesim/tests/mock_reader.h | 4 ++-- clients/drcachesim/tests/prefetch_analyzer.h | 4 ++-- clients/drcachesim/tests/test_helpers.h | 2 +- clients/drcachesim/tests/tlb_simulator_unit_test.h | 4 ++-- clients/drcachesim/tests/v2p_reader_unit_test.h | 4 ++-- clients/drcachesim/tools/basic_counts.h | 4 ++-- clients/drcachesim/tools/basic_counts_create.h | 4 ++-- clients/drcachesim/tools/common/decode_cache.h | 4 ++-- clients/drcachesim/tools/external/example/empty.h | 4 ++-- clients/drcachesim/tools/external/example/empty_create.h | 4 ++-- clients/drcachesim/tools/filter/cache_filter.h | 4 ++-- clients/drcachesim/tools/filter/encodings2regdeps_filter.h | 4 ++-- clients/drcachesim/tools/filter/func_id_filter.h | 4 ++-- clients/drcachesim/tools/filter/modify_marker_value_filter.h | 4 ++-- clients/drcachesim/tools/filter/null_filter.h | 4 ++-- clients/drcachesim/tools/filter/record_filter.h | 4 ++-- clients/drcachesim/tools/filter/record_filter_create.h | 4 ++-- clients/drcachesim/tools/filter/trim_filter.h | 4 ++-- clients/drcachesim/tools/filter/type_filter.h | 4 ++-- clients/drcachesim/tools/func_view.h | 4 ++-- clients/drcachesim/tools/func_view_create.h | 4 ++-- clients/drcachesim/tools/histogram.h | 4 ++-- clients/drcachesim/tools/histogram_create.h | 4 ++-- clients/drcachesim/tools/invariant_checker.h | 2 +- clients/drcachesim/tools/invariant_checker_create.h | 4 ++-- clients/drcachesim/tools/loader/dynamic_lib.h | 4 ++-- clients/drcachesim/tools/loader/external_config_file.h | 4 ++-- clients/drcachesim/tools/loader/external_tool_creator.h | 4 ++-- clients/drcachesim/tools/opcode_mix.h | 2 +- clients/drcachesim/tools/opcode_mix_create.h | 4 ++-- clients/drcachesim/tools/reuse_distance.h | 4 ++-- clients/drcachesim/tools/reuse_distance_create.h | 4 ++-- clients/drcachesim/tools/reuse_time.h | 4 ++-- clients/drcachesim/tools/reuse_time_create.h | 4 ++-- clients/drcachesim/tools/schedule_stats.h | 2 +- clients/drcachesim/tools/schedule_stats_create.h | 4 ++-- clients/drcachesim/tools/syscall_mix.h | 2 +- clients/drcachesim/tools/syscall_mix_create.h | 4 ++-- clients/drcachesim/tools/view.h | 2 +- clients/drcachesim/tools/view_create.h | 2 +- clients/drcachesim/tracer/dr_allocator.h | 4 ++-- clients/drcachesim/tracer/drmemtrace.h | 4 ++-- clients/drcachesim/tracer/func_trace.h | 4 ++-- clients/drcachesim/tracer/instr_counter.h | 4 ++-- clients/drcachesim/tracer/instru.h | 4 ++-- clients/drcachesim/tracer/kcore_copy.h | 4 ++-- clients/drcachesim/tracer/output.h | 4 ++-- clients/drcachesim/tracer/physaddr.h | 4 ++-- clients/drcachesim/tracer/raw2trace.h | 2 +- clients/drcachesim/tracer/raw2trace_directory.h | 4 ++-- clients/drcachesim/tracer/raw2trace_shared.h | 2 +- clients/drcachesim/tracer/snappy_file_writer.h | 4 ++-- clients/drcachesim/tracer/syscall_pt_trace.h | 4 ++-- clients/drcachesim/tracer/tracer.h | 4 ++-- clients/drcpusim/options.h | 4 ++-- core/annotations.h | 4 ++-- core/annotations_api.h | 2 +- core/arch/arch_exports.h | 2 +- core/arch/asm_defines.asm | 4 ++-- core/arch/atomic_exports.h | 2 +- core/arch/clean_call_opt.h | 2 +- core/arch/proc.h | 2 +- core/arch/proc_api.h | 4 ++-- core/arch/sideline.h | 2 +- core/arch/x86/x86_asm_defines.asm | 2 +- core/config.h | 4 ++-- core/dispatch.h | 4 ++-- core/drlibc/drlibc.h | 4 ++-- core/drlibc/drlibc_unix.h | 4 ++-- core/emit.h | 2 +- core/fcache.h | 4 ++-- core/fragment.h | 2 +- core/fragment_api.h | 4 ++-- core/globals.h | 2 +- core/hashtable.h | 2 +- core/heap.h | 2 +- core/hotpatch.h | 2 +- core/ir/aarch64/build_ldstex.h | 2 +- core/ir/aarch64/codec.h | 2 +- core/ir/aarch64/decode_private.h | 2 +- core/ir/aarch64/instr_create_api.h | 2 +- core/ir/arm/instr_create_api.h | 4 ++-- core/ir/arm/opcode_api.h | 4 ++-- core/ir/decode_api.h | 4 ++-- core/ir/disassemble_api.h | 4 ++-- core/ir/dr_ir_opcodes.h | 4 ++-- core/ir/encode_api.h | 4 ++-- core/ir/instr.h | 2 +- core/ir/instr_api.h | 2 +- core/ir/instr_create_shared.h | 4 ++-- core/ir/instr_create_shared_api.h | 4 ++-- core/ir/instr_inline_api.h | 2 +- core/ir/instrlist.h | 2 +- core/ir/instrlist_api.h | 4 ++-- core/ir/ir_utils.h | 4 ++-- core/ir/isa_regdeps/decode.h | 4 ++-- core/ir/isa_regdeps/disassemble.h | 4 ++-- core/ir/isa_regdeps/encode.h | 4 ++-- core/ir/opnd.h | 4 ++-- core/ir/opnd_api.h | 2 +- core/ir/riscv64/codec.h | 2 +- core/ir/riscv64/decode_private.h | 2 +- core/ir/riscv64/instr_create_api.h.in | 2 +- core/ir/riscv64/opcode_api.h.in | 2 +- core/ir/riscv64/trie.h | 2 +- core/ir/x86/instr_create.h | 4 ++-- core/ir/x86/instr_create_api.h | 2 +- core/ir/x86/opcode_api.h | 4 ++-- core/jit_opt.h | 2 +- core/lib/c_defines.h | 4 ++-- core/lib/dr_annotations.h | 4 ++-- core/lib/dr_annotations_asm.h | 4 ++-- core/lib/dr_api.h | 4 ++-- core/lib/dr_app.h | 2 +- core/lib/dr_config.h | 4 ++-- core/lib/dr_events.h | 2 +- core/lib/dr_inject.h | 4 ++-- core/lib/dr_ir_utils.h | 2 +- core/lib/dr_stats.h | 2 +- core/lib/dr_tools.h | 2 +- core/lib/globals_api.h | 2 +- core/lib/globals_shared.h | 2 +- core/lib/hotpatch_interface.h | 2 +- core/lib/instrument.h | 4 ++-- core/lib/probe_api.h | 2 +- core/link.h | 2 +- core/module_api.h | 4 ++-- core/monitor.h | 2 +- core/native_exec.h | 4 ++-- core/os_api.h | 2 +- core/perscache.h | 2 +- core/translate.h | 4 ++-- core/unix/include/android_linker.h | 2 +- core/unix/include/syscall.h | 2 +- core/unix/include/syscall_linux_arm.h | 2 +- core/unix/include/syscall_linux_riscv64.h | 2 +- core/unix/include/syscall_linux_uapi.h | 2 +- core/unix/include/syscall_linux_x86.h | 2 +- core/unix/include/syscall_mach.h | 4 ++-- core/unix/include/syscall_target.h | 2 +- core/unix/ksynch.h | 4 ++-- core/unix/memcache.h | 4 ++-- core/unix/memquery.h | 4 ++-- core/unix/memquery_macos.h | 4 ++-- core/unix/module_macos_dyld.h | 2 +- core/unix/os_asm_defines.asm | 4 ++-- core/unix/os_exports.h | 2 +- core/unix/os_private.h | 4 ++-- core/unix/os_public.h | 4 ++-- core/unix/rseq_linux.h | 4 ++-- core/unix/signal_private.h | 2 +- core/unix/symtab.h | 2 +- core/unix/tls.h | 2 +- core/utils.h | 2 +- core/vmareas.h | 2 +- core/win32/diagnost.h | 2 +- core/win32/drwinapi/advapi32_redir.h | 4 ++-- core/win32/drwinapi/drwinapi.h | 4 ++-- core/win32/drwinapi/drwinapi_private.h | 4 ++-- core/win32/drwinapi/kernel32_redir.h | 4 ++-- core/win32/drwinapi/ntdll_redir.h | 4 ++-- core/win32/drwinapi/rpcrt4_redir.h | 4 ++-- core/win32/ntdll.h | 2 +- core/win32/ntdll_shared.h | 4 ++-- core/win32/ntdll_types.h | 2 +- core/win32/os_exports.h | 2 +- core/win32/os_private.h | 2 +- core/win32/os_public.h | 2 +- ext/drbbdup/drbbdup.h | 4 ++-- ext/drcallstack/drcallstack.h | 4 ++-- ext/drcontainers/drtable.h | 4 ++-- ext/drcontainers/drvector.h | 4 ++-- ext/drcontainers/hashtable.h | 4 ++-- ext/drcovlib/drcovlib.h | 2 +- ext/drext.h | 4 ++-- ext/drmf/common/asm_utils.h | 4 ++-- ext/drmf/common/utils.h | 2 +- ext/drmf/common/windefs.h | 2 +- ext/drmf/framework/drmf.h | 2 +- ext/drmf/framework/public.h | 2 +- ext/drmf/wininc/crtdbg.h | 2 +- ext/drmf/wininc/ktmtypes.h | 2 +- ext/drmf/wininc/ntexapi.h | 2 +- ext/drmf/wininc/ntuser_ex.h | 2 +- ext/drmf/wininc/ntuser_win8.h | 2 +- ext/drmf/wininc/tls.h | 2 +- ext/drmf/wininc/winnt_recent.h | 2 +- ext/drmf/wininc/wsock.h | 2 +- ext/drmgr/drmgr.h | 2 +- ext/drmgr/drmgr_priv.h | 4 ++-- ext/droption/droption.h | 2 +- ext/drpttracer/drpttracer.h | 4 ++-- ext/drpttracer/drpttracer_shared.h | 4 ++-- ext/drreg/drreg.h | 4 ++-- ext/drsyms/dbghelp_imports.h | 4 ++-- ext/drsyms/drsyms.h | 4 ++-- ext/drsyscall/drsyscall.h | 4 ++-- ext/drsyscall/drsyscall_driver.h | 4 ++-- ext/drsyscall/drsyscall_os.h | 2 +- ext/drsyscall/drsyscall_record.h | 4 ++-- ext/drsyscall/drsyscall_record_lib.h | 4 ++-- ext/drsyscall/drsyscall_windows.h | 2 +- ext/drsyscall/linux_defines.h | 4 ++-- ext/drsyscall/table_defines.h | 4 ++-- ext/drutil/drutil.h | 4 ++-- ext/drwrap/drwrap.h | 4 ++-- ext/drx/drx.h | 2 +- make/configure.cmake.h | 2 +- suite/tests/api/detach_state_shared.h | 4 ++-- .../client-interface/annotation/test_annotation_arguments.h | 4 ++-- .../tests/client-interface/annotation/test_mode_annotations.h | 4 ++-- suite/tests/client-interface/avx512ctx-shared.h | 4 ++-- 279 files changed, 453 insertions(+), 453 deletions(-) diff --git a/api/docs/tutorial.dox b/api/docs/tutorial.dox index 53d6609b2e..0242092a17 100644 --- a/api/docs/tutorial.dox +++ b/api/docs/tutorial.dox @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2015 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2009 VMware, Inc. All rights reserved. * **********************************************************/ @@ -1191,7 +1191,7 @@ annotation. The first step is to copy the DynamoRIO souce file \code #ifndef _DYNAMORIO_ANNOTATIONS_H_ -#define _DYNAMORIO_ANNOTATIONS_H_ 1 +#define _DYNAMORIO_ANNOTATIONS_H_ #include "dr_annotations_asm.h" diff --git a/clients/drcachesim/analysis_tool.h b/clients/drcachesim/analysis_tool.h index 0cb5d1117c..f0a1821a19 100644 --- a/clients/drcachesim/analysis_tool.h +++ b/clients/drcachesim/analysis_tool.h @@ -34,7 +34,7 @@ */ #ifndef _ANALYSIS_TOOL_H_ -#define _ANALYSIS_TOOL_H_ 1 +#define _ANALYSIS_TOOL_H_ /** * @file drmemtrace/analysis_tool.h diff --git a/clients/drcachesim/analyzer.h b/clients/drcachesim/analyzer.h index 15831e2269..eafc2afaba 100644 --- a/clients/drcachesim/analyzer.h +++ b/clients/drcachesim/analyzer.h @@ -36,7 +36,7 @@ */ #ifndef _ANALYZER_H_ -#define _ANALYZER_H_ 1 +#define _ANALYZER_H_ /** * @file drmemtrace/analyzer.h diff --git a/clients/drcachesim/analyzer_multi.h b/clients/drcachesim/analyzer_multi.h index 190d5e1d58..15081bcf4e 100644 --- a/clients/drcachesim/analyzer_multi.h +++ b/clients/drcachesim/analyzer_multi.h @@ -35,7 +35,7 @@ */ #ifndef _ANALYZER_MULTI_H_ -#define _ANALYZER_MULTI_H_ 1 +#define _ANALYZER_MULTI_H_ #include "analyzer.h" #include "archive_ostream.h" diff --git a/clients/drcachesim/common/archive_istream.h b/clients/drcachesim/common/archive_istream.h index f4ad4980be..904892df8e 100644 --- a/clients/drcachesim/common/archive_istream.h +++ b/clients/drcachesim/common/archive_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _ARCHIVE_ISTREAM_H_ -#define _ARCHIVE_ISTREAM_H_ 1 +#define _ARCHIVE_ISTREAM_H_ #include diff --git a/clients/drcachesim/common/archive_ostream.h b/clients/drcachesim/common/archive_ostream.h index 3c3f9cbb94..ceafb8fc53 100644 --- a/clients/drcachesim/common/archive_ostream.h +++ b/clients/drcachesim/common/archive_ostream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2023 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _ARCHIVE_OSTREAM_H_ -#define _ARCHIVE_OSTREAM_H_ 1 +#define _ARCHIVE_OSTREAM_H_ #include diff --git a/clients/drcachesim/common/crc32c.h b/clients/drcachesim/common/crc32c.h index e0ab5b86bf..6f59c77e10 100644 --- a/clients/drcachesim/common/crc32c.h +++ b/clients/drcachesim/common/crc32c.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2019-2023 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CRC32_H_ -#define _CRC32_H_ 1 +#define _CRC32_H_ #include diff --git a/clients/drcachesim/common/directory_iterator.h b/clients/drcachesim/common/directory_iterator.h index e00311067a..fb8f42eec8 100644 --- a/clients/drcachesim/common/directory_iterator.h +++ b/clients/drcachesim/common/directory_iterator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _DIRECTORY_ITERATOR_H_ -#define _DIRECTORY_ITERATOR_H_ 1 +#define _DIRECTORY_ITERATOR_H_ #include diff --git a/clients/drcachesim/common/gzip_istream.h b/clients/drcachesim/common/gzip_istream.h index 7b6dc8b605..275d910d67 100644 --- a/clients/drcachesim/common/gzip_istream.h +++ b/clients/drcachesim/common/gzip_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _GZIP_ISTREAM_H_ -#define _GZIP_ISTREAM_H_ 1 +#define _GZIP_ISTREAM_H_ #ifndef HAS_ZLIB # error HAS_ZLIB is required diff --git a/clients/drcachesim/common/gzip_ostream.h b/clients/drcachesim/common/gzip_ostream.h index 9c860640c8..a41d76e98c 100644 --- a/clients/drcachesim/common/gzip_ostream.h +++ b/clients/drcachesim/common/gzip_ostream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _GZIP_OSTREAM_H_ -#define _GZIP_OSTREAM_H_ 1 +#define _GZIP_OSTREAM_H_ #ifndef HAS_ZLIB # error HAS_ZLIB is required diff --git a/clients/drcachesim/common/lz4_istream.h b/clients/drcachesim/common/lz4_istream.h index 1cb7fbb64b..f8b73954f8 100644 --- a/clients/drcachesim/common/lz4_istream.h +++ b/clients/drcachesim/common/lz4_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020-2023 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _LZ4_ISTREAM_H_ -#define _LZ4_ISTREAM_H_ 1 +#define _LZ4_ISTREAM_H_ #ifndef HAS_LZ4 # error HAS_LZ4 is required diff --git a/clients/drcachesim/common/lz4_ostream.h b/clients/drcachesim/common/lz4_ostream.h index bd039870ee..7ce0b2f722 100644 --- a/clients/drcachesim/common/lz4_ostream.h +++ b/clients/drcachesim/common/lz4_ostream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _LZ4_OSTREAM_H_ -#define _LZ4_OSTREAM_H_ 1 +#define _LZ4_OSTREAM_H_ #ifndef HAS_LZ4 # error HAS_LZ4 is required diff --git a/clients/drcachesim/common/memref.h b/clients/drcachesim/common/memref.h index 6b8bcd8edb..aff58ee0aa 100644 --- a/clients/drcachesim/common/memref.h +++ b/clients/drcachesim/common/memref.h @@ -33,7 +33,7 @@ /* This is the data format that the simulator and analysis tools take as input. */ #ifndef _MEMREF_H_ -#define _MEMREF_H_ 1 +#define _MEMREF_H_ #include #include // for size_t diff --git a/clients/drcachesim/common/memtrace_stream.h b/clients/drcachesim/common/memtrace_stream.h index 01c6fc171a..6d8d0a9797 100644 --- a/clients/drcachesim/common/memtrace_stream.h +++ b/clients/drcachesim/common/memtrace_stream.h @@ -43,7 +43,7 @@ */ #ifndef _MEMTRACE_STREAM_H_ -#define _MEMTRACE_STREAM_H_ 1 +#define _MEMTRACE_STREAM_H_ #include #include diff --git a/clients/drcachesim/common/mutex_dbg_owned.h b/clients/drcachesim/common/mutex_dbg_owned.h index a17b86f336..f210708961 100644 --- a/clients/drcachesim/common/mutex_dbg_owned.h +++ b/clients/drcachesim/common/mutex_dbg_owned.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* mutex_dbg_owned.h: std::mutex plus an assertable owner and stats in debug builds. */ #ifndef _MUTEX_DBG_OWNED_H_ -#define _MUTEX_DBG_OWNED_H_ 1 +#define _MUTEX_DBG_OWNED_H_ #include #include diff --git a/clients/drcachesim/common/named_pipe.h b/clients/drcachesim/common/named_pipe.h index 56573aa4a5..5585f82c75 100644 --- a/clients/drcachesim/common/named_pipe.h +++ b/clients/drcachesim/common/named_pipe.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _NAMED_PIPE_H_ -#define _NAMED_PIPE_H_ 1 +#define _NAMED_PIPE_H_ #include #ifdef WINDOWS diff --git a/clients/drcachesim/common/options.h b/clients/drcachesim/common/options.h index 825ca0decd..c1b24e8a74 100644 --- a/clients/drcachesim/common/options.h +++ b/clients/drcachesim/common/options.h @@ -33,7 +33,7 @@ /* shared options for the frontend, the client, and the documentation */ #ifndef _OPTIONS_H_ -#define _OPTIONS_H_ 1 +#define _OPTIONS_H_ // Tool names (for -tool option). #define CPU_CACHE_LEGACY "cache" diff --git a/clients/drcachesim/common/schedule_file.h b/clients/drcachesim/common/schedule_file.h index 715a711caf..a4c8b8950f 100644 --- a/clients/drcachesim/common/schedule_file.h +++ b/clients/drcachesim/common/schedule_file.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _SCHEDULE_FILE_H_ -#define _SCHEDULE_FILE_H_ 1 +#define _SCHEDULE_FILE_H_ #include #include diff --git a/clients/drcachesim/common/snappy_consts.h b/clients/drcachesim/common/snappy_consts.h index 72b7e556d1..dca8ea754e 100644 --- a/clients/drcachesim/common/snappy_consts.h +++ b/clients/drcachesim/common/snappy_consts.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2019-2023 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -37,7 +37,7 @@ */ #ifndef _SNAPPY_CONSTS_H_ -#define _SNAPPY_CONSTS_H_ 1 +#define _SNAPPY_CONSTS_H_ #include #include "crc32c.h" diff --git a/clients/drcachesim/common/snappy_istream.h b/clients/drcachesim/common/snappy_istream.h index fe305c8890..a1f1a7e0c2 100644 --- a/clients/drcachesim/common/snappy_istream.h +++ b/clients/drcachesim/common/snappy_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _SNAPPY_ISTREAM_H_ -#define _SNAPPY_ISTREAM_H_ 1 +#define _SNAPPY_ISTREAM_H_ #ifndef HAS_SNAPPY # error HAS_SNAPPY is required diff --git a/clients/drcachesim/common/trace_entry.h b/clients/drcachesim/common/trace_entry.h index 04e244d9a4..2752b35183 100644 --- a/clients/drcachesim/common/trace_entry.h +++ b/clients/drcachesim/common/trace_entry.h @@ -41,7 +41,7 @@ */ #ifndef _TRACE_ENTRY_H_ -#define _TRACE_ENTRY_H_ 1 +#define _TRACE_ENTRY_H_ #include #include diff --git a/clients/drcachesim/common/utils.h b/clients/drcachesim/common/utils.h index 781719354d..14e103f390 100644 --- a/clients/drcachesim/common/utils.h +++ b/clients/drcachesim/common/utils.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2024 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* utils.h: utilities for cache simulator */ #ifndef _UTILS_H_ -#define _UTILS_H_ 1 +#define _UTILS_H_ #include #include diff --git a/clients/drcachesim/common/zipfile_istream.h b/clients/drcachesim/common/zipfile_istream.h index cdeb638d6f..2dc904444c 100644 --- a/clients/drcachesim/common/zipfile_istream.h +++ b/clients/drcachesim/common/zipfile_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _ZIPFILE_ISTREAM_H_ -#define _ZIPFILE_ISTREAM_H_ 1 +#define _ZIPFILE_ISTREAM_H_ #ifndef HAS_ZIP # error HAS_ZIP is required diff --git a/clients/drcachesim/common/zipfile_ostream.h b/clients/drcachesim/common/zipfile_ostream.h index fd1a56ee82..7eb0ec5500 100644 --- a/clients/drcachesim/common/zipfile_ostream.h +++ b/clients/drcachesim/common/zipfile_ostream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ // https://github.com/madler/zlib/blob/master/contrib/minizip/zip.h #ifndef _ZIPFILE_OSTREAM_H_ -#define _ZIPFILE_OSTREAM_H_ 1 +#define _ZIPFILE_OSTREAM_H_ #include #include diff --git a/clients/drcachesim/common/zlib_istream.h b/clients/drcachesim/common/zlib_istream.h index cff6d67843..df9ab077f0 100644 --- a/clients/drcachesim/common/zlib_istream.h +++ b/clients/drcachesim/common/zlib_istream.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020-2023 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _ZLIB_ISTREAM_H_ -#define _ZLIB_ISTREAM_H_ 1 +#define _ZLIB_ISTREAM_H_ #ifndef HAS_ZLIB # error HAS_ZLIB is required diff --git a/clients/drcachesim/drpt2trace/drir.h b/clients/drcachesim/drpt2trace/drir.h index a8f177a423..94356a5cc4 100644 --- a/clients/drcachesim/drpt2trace/drir.h +++ b/clients/drcachesim/drpt2trace/drir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* drir: the type wraps instrlist_t. */ #ifndef _DRIR_H_ -#define _DRIR_H_ 1 +#define _DRIR_H_ #ifndef DR_FAST_IR # define DR_FAST_IR 1 diff --git a/clients/drcachesim/drpt2trace/elf_loader.h b/clients/drcachesim/drpt2trace/elf_loader.h index 0f59b965b4..f70d53347c 100644 --- a/clients/drcachesim/drpt2trace/elf_loader.h +++ b/clients/drcachesim/drpt2trace/elf_loader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -37,7 +37,7 @@ */ #ifndef _ELF_LOADER_H_ -#define _ELF_LOADER_H_ 1 +#define _ELF_LOADER_H_ #include #include diff --git a/clients/drcachesim/drpt2trace/ir2trace.h b/clients/drcachesim/drpt2trace/ir2trace.h index 13444881f2..fba6801311 100644 --- a/clients/drcachesim/drpt2trace/ir2trace.h +++ b/clients/drcachesim/drpt2trace/ir2trace.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* ir2trace: convert DynamoRIO's IR format to trace entries. */ #ifndef _IR2TRACE_H_ -#define _IR2TRACE_H_ 1 +#define _IR2TRACE_H_ /** * @file ir2trace.h diff --git a/clients/drcachesim/drpt2trace/pt2ir.h b/clients/drcachesim/drpt2trace/pt2ir.h index 95801ea2c2..94d4b121fe 100644 --- a/clients/drcachesim/drpt2trace/pt2ir.h +++ b/clients/drcachesim/drpt2trace/pt2ir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023-2024 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* pt2ir: convert a PT raw trace to DynamoRIO's IR format. */ #ifndef _PT2IR_H_ -#define _PT2IR_H_ 1 +#define _PT2IR_H_ /** * @file pt2ir.h diff --git a/clients/drcachesim/reader/compressed_file_reader.h b/clients/drcachesim/reader/compressed_file_reader.h index 7de78feed7..00c7f4fd14 100644 --- a/clients/drcachesim/reader/compressed_file_reader.h +++ b/clients/drcachesim/reader/compressed_file_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* compressed_file_reader: reads compressed files containing memory traces. */ #ifndef _COMPRESSED_FILE_READER_H_ -#define _COMPRESSED_FILE_READER_H_ 1 +#define _COMPRESSED_FILE_READER_H_ #include diff --git a/clients/drcachesim/reader/config_reader.h b/clients/drcachesim/reader/config_reader.h index 5f1e4b509f..bf72bc7901 100644 --- a/clients/drcachesim/reader/config_reader.h +++ b/clients/drcachesim/reader/config_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, LLC All rights reserved. + * Copyright (c) 2018-2025 Google, LLC All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _CONFIG_READER_H_ -#define _CONFIG_READER_H_ 1 +#define _CONFIG_READER_H_ #include diff --git a/clients/drcachesim/reader/file_reader.h b/clients/drcachesim/reader/file_reader.h index d9b4ab8a10..046edc0853 100644 --- a/clients/drcachesim/reader/file_reader.h +++ b/clients/drcachesim/reader/file_reader.h @@ -36,7 +36,7 @@ */ #ifndef _FILE_READER_H_ -#define _FILE_READER_H_ 1 +#define _FILE_READER_H_ #include #include diff --git a/clients/drcachesim/reader/ipc_reader.h b/clients/drcachesim/reader/ipc_reader.h index ff3ab64e55..d24f101872 100644 --- a/clients/drcachesim/reader/ipc_reader.h +++ b/clients/drcachesim/reader/ipc_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _IPC_READER_H_ -#define _IPC_READER_H_ 1 +#define _IPC_READER_H_ #include "reader.h" #include "../common/memref.h" diff --git a/clients/drcachesim/reader/lz4_file_reader.h b/clients/drcachesim/reader/lz4_file_reader.h index 5c9f09e35b..6f53f3a684 100644 --- a/clients/drcachesim/reader/lz4_file_reader.h +++ b/clients/drcachesim/reader/lz4_file_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* lz4_file_reader: reads compressed files containing memory traces. */ #ifndef _LZ4_FILE_READER_H_ -#define _LZ4_FILE_READER_H_ 1 +#define _LZ4_FILE_READER_H_ #include "common/lz4_istream.h" #include "file_reader.h" diff --git a/clients/drcachesim/reader/reader.h b/clients/drcachesim/reader/reader.h index 3dda379835..8b40c2ee2d 100644 --- a/clients/drcachesim/reader/reader.h +++ b/clients/drcachesim/reader/reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2024 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _READER_H_ -#define _READER_H_ 1 +#define _READER_H_ #include #include diff --git a/clients/drcachesim/reader/reader_base.h b/clients/drcachesim/reader/reader_base.h index 8fa6ea9450..05f4a64b7c 100644 --- a/clients/drcachesim/reader/reader_base.h +++ b/clients/drcachesim/reader/reader_base.h @@ -36,7 +36,7 @@ */ #ifndef _READER_BASE_H_ -#define _READER_BASE_H_ 1 +#define _READER_BASE_H_ #include diff --git a/clients/drcachesim/reader/record_file_reader.h b/clients/drcachesim/reader/record_file_reader.h index 492bc8f2fd..b64c2fca50 100644 --- a/clients/drcachesim/reader/record_file_reader.h +++ b/clients/drcachesim/reader/record_file_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _RECORD_FILE_READER_H_ -#define _RECORD_FILE_READER_H_ 1 +#define _RECORD_FILE_READER_H_ #include #include diff --git a/clients/drcachesim/reader/snappy_file_reader.h b/clients/drcachesim/reader/snappy_file_reader.h index c87fbc7396..bfd9088316 100644 --- a/clients/drcachesim/reader/snappy_file_reader.h +++ b/clients/drcachesim/reader/snappy_file_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2019-2023 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -37,7 +37,7 @@ */ #ifndef _SNAPPY_FILE_READER_H_ -#define _SNAPPY_FILE_READER_H_ 1 +#define _SNAPPY_FILE_READER_H_ #include #include diff --git a/clients/drcachesim/reader/v2p_reader.h b/clients/drcachesim/reader/v2p_reader.h index cb6a651e90..4af4fc8c8e 100644 --- a/clients/drcachesim/reader/v2p_reader.h +++ b/clients/drcachesim/reader/v2p_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, LLC All rights reserved. + * Copyright (c) 2024-2025 Google, LLC All rights reserved. * **********************************************************/ /* @@ -48,7 +48,7 @@ */ #ifndef _V2P_READER_H_ -#define _V2P_READER_H_ 1 +#define _V2P_READER_H_ #include "trace_entry.h" diff --git a/clients/drcachesim/reader/zipfile_file_reader.h b/clients/drcachesim/reader/zipfile_file_reader.h index 695f3a63b9..4e16d7c241 100644 --- a/clients/drcachesim/reader/zipfile_file_reader.h +++ b/clients/drcachesim/reader/zipfile_file_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* zipfile_file_reader: reads zipfile files containing memory traces. */ #ifndef _ZIPFILE_FILE_READER_H_ -#define _ZIPFILE_FILE_READER_H_ 1 +#define _ZIPFILE_FILE_READER_H_ #include #include "minizip/unzip.h" diff --git a/clients/drcachesim/scheduler/flexible_queue.h b/clients/drcachesim/scheduler/flexible_queue.h index 43518ea043..45c4a1f045 100644 --- a/clients/drcachesim/scheduler/flexible_queue.h +++ b/clients/drcachesim/scheduler/flexible_queue.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023-2024 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* A priority queue with constant-time search and removal from the middle. */ #ifndef _DRMEMTRACE_FLEXIBLE_QUEUE_H_ -#define _DRMEMTRACE_FLEXIBLE_QUEUE_H_ 1 +#define _DRMEMTRACE_FLEXIBLE_QUEUE_H_ /** * @file drmemtrace/flexible_queue.h diff --git a/clients/drcachesim/scheduler/noise_generator.h b/clients/drcachesim/scheduler/noise_generator.h index ec19089fbb..a0399787df 100644 --- a/clients/drcachesim/scheduler/noise_generator.h +++ b/clients/drcachesim/scheduler/noise_generator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2025 Google, Inc. All rights reserved. + * Copyright (c) 2025-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _NOISE_GENERATOR_H_ -#define _NOISE_GENERATOR_H_ 1 +#define _NOISE_GENERATOR_H_ #include "reader.h" #include "scheduler.h" diff --git a/clients/drcachesim/scheduler/scheduler.h b/clients/drcachesim/scheduler/scheduler.h index a19b1f2f6f..8df5984722 100644 --- a/clients/drcachesim/scheduler/scheduler.h +++ b/clients/drcachesim/scheduler/scheduler.h @@ -33,7 +33,7 @@ /* Scheduler of traced software threads onto simulated cpus. */ #ifndef _DRMEMTRACE_SCHEDULER_H_ -#define _DRMEMTRACE_SCHEDULER_H_ 1 +#define _DRMEMTRACE_SCHEDULER_H_ /** * @file drmemtrace/scheduler.h diff --git a/clients/drcachesim/scheduler/scheduler_impl.h b/clients/drcachesim/scheduler/scheduler_impl.h index 55e7695f76..43efddb431 100644 --- a/clients/drcachesim/scheduler/scheduler_impl.h +++ b/clients/drcachesim/scheduler/scheduler_impl.h @@ -33,7 +33,7 @@ /* Private implementation of drmemtrace scheduler. */ #ifndef _DRMEMTRACE_SCHEDULER_IMPL_H_ -#define _DRMEMTRACE_SCHEDULER_IMPL_H_ 1 +#define _DRMEMTRACE_SCHEDULER_IMPL_H_ #define NOMINMAX // Avoid windows.h messing up std::max. #include diff --git a/clients/drcachesim/scheduler/speculator.h b/clients/drcachesim/scheduler/speculator.h index e939a81441..465c8449a4 100644 --- a/clients/drcachesim/scheduler/speculator.h +++ b/clients/drcachesim/scheduler/speculator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* Speculative execution path instruction and data access generation. */ #ifndef _DRMEMTRACE_SPECULATOR_H_ -#define _DRMEMTRACE_SPECULATOR_H_ 1 +#define _DRMEMTRACE_SPECULATOR_H_ /** * @file drmemtrace/speculator.h diff --git a/clients/drcachesim/simulator/cache.h b/clients/drcachesim/simulator/cache.h index ff26b0a32a..cd99c0cdb7 100644 --- a/clients/drcachesim/simulator/cache.h +++ b/clients/drcachesim/simulator/cache.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _CACHE_H_ -#define _CACHE_H_ 1 +#define _CACHE_H_ #include #include diff --git a/clients/drcachesim/simulator/cache_line.h b/clients/drcachesim/simulator/cache_line.h index 455b066052..760f80f8ce 100644 --- a/clients/drcachesim/simulator/cache_line.h +++ b/clients/drcachesim/simulator/cache_line.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _CACHE_LINE_H_ -#define _CACHE_LINE_H_ 1 +#define _CACHE_LINE_H_ #include "caching_device_block.h" diff --git a/clients/drcachesim/simulator/cache_miss_analyzer.h b/clients/drcachesim/simulator/cache_miss_analyzer.h index 0407c65fad..8aa2693479 100644 --- a/clients/drcachesim/simulator/cache_miss_analyzer.h +++ b/clients/drcachesim/simulator/cache_miss_analyzer.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, LLC All rights reserved. + * Copyright (c) 2015-2025 Google, LLC All rights reserved. * **********************************************************/ /* @@ -37,7 +37,7 @@ */ #ifndef _CACHE_MISS_ANALYZER_H_ -#define _CACHE_MISS_ANALYZER_H_ 1 +#define _CACHE_MISS_ANALYZER_H_ #include #include diff --git a/clients/drcachesim/simulator/cache_replacement_policy.h b/clients/drcachesim/simulator/cache_replacement_policy.h index 4068a79709..23d2ed2b42 100644 --- a/clients/drcachesim/simulator/cache_replacement_policy.h +++ b/clients/drcachesim/simulator/cache_replacement_policy.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CACHE_REPLACEMENT_POLICY_H_ -#define _CACHE_REPLACEMENT_POLICY_H_ 1 +#define _CACHE_REPLACEMENT_POLICY_H_ #include #include diff --git a/clients/drcachesim/simulator/cache_simulator.h b/clients/drcachesim/simulator/cache_simulator.h index 8b34e617f6..0450d13ae7 100644 --- a/clients/drcachesim/simulator/cache_simulator.h +++ b/clients/drcachesim/simulator/cache_simulator.h @@ -34,7 +34,7 @@ */ #ifndef _CACHE_SIMULATOR_H_ -#define _CACHE_SIMULATOR_H_ 1 +#define _CACHE_SIMULATOR_H_ #include #include diff --git a/clients/drcachesim/simulator/cache_simulator_create.h b/clients/drcachesim/simulator/cache_simulator_create.h index 4eaea0d5b2..47e9315058 100644 --- a/clients/drcachesim/simulator/cache_simulator_create.h +++ b/clients/drcachesim/simulator/cache_simulator_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* cache simulator creation */ #ifndef _CACHE_SIMULATOR_CREATE_H_ -#define _CACHE_SIMULATOR_CREATE_H_ 1 +#define _CACHE_SIMULATOR_CREATE_H_ #include #include "analysis_tool.h" diff --git a/clients/drcachesim/simulator/cache_stats.h b/clients/drcachesim/simulator/cache_stats.h index 86eec1d401..c36cc3ceca 100644 --- a/clients/drcachesim/simulator/cache_stats.h +++ b/clients/drcachesim/simulator/cache_stats.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _CACHE_STATS_H_ -#define _CACHE_STATS_H_ 1 +#define _CACHE_STATS_H_ #include diff --git a/clients/drcachesim/simulator/caching_device.h b/clients/drcachesim/simulator/caching_device.h index 0c35b0bcbc..5396b52130 100644 --- a/clients/drcachesim/simulator/caching_device.h +++ b/clients/drcachesim/simulator/caching_device.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _CACHING_DEVICE_H_ -#define _CACHING_DEVICE_H_ 1 +#define _CACHING_DEVICE_H_ #include #include diff --git a/clients/drcachesim/simulator/caching_device_block.h b/clients/drcachesim/simulator/caching_device_block.h index a2f161bc88..661369d383 100644 --- a/clients/drcachesim/simulator/caching_device_block.h +++ b/clients/drcachesim/simulator/caching_device_block.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _CACHING_DEVICE_BLOCK_H_ -#define _CACHING_DEVICE_BLOCK_H_ 1 +#define _CACHING_DEVICE_BLOCK_H_ #include #include "memref.h" diff --git a/clients/drcachesim/simulator/caching_device_stats.h b/clients/drcachesim/simulator/caching_device_stats.h index 80955bd34f..d203ddc09e 100644 --- a/clients/drcachesim/simulator/caching_device_stats.h +++ b/clients/drcachesim/simulator/caching_device_stats.h @@ -34,7 +34,7 @@ */ #ifndef _CACHING_DEVICE_STATS_H_ -#define _CACHING_DEVICE_STATS_H_ 1 +#define _CACHING_DEVICE_STATS_H_ #define NOMINMAX // Avoid windows.h messing up std::max. diff --git a/clients/drcachesim/simulator/create_cache_replacement_policy.h b/clients/drcachesim/simulator/create_cache_replacement_policy.h index ffaaf3587e..ccf0aa3972 100644 --- a/clients/drcachesim/simulator/create_cache_replacement_policy.h +++ b/clients/drcachesim/simulator/create_cache_replacement_policy.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CREATE_CACHE_REPLACEMENT_POLICY_H_ -#define _CREATE_CACHE_REPLACEMENT_POLICY_H_ 1 +#define _CREATE_CACHE_REPLACEMENT_POLICY_H_ #include #include diff --git a/clients/drcachesim/simulator/prefetcher.h b/clients/drcachesim/simulator/prefetcher.h index 5729ae2c38..6e7cd96516 100644 --- a/clients/drcachesim/simulator/prefetcher.h +++ b/clients/drcachesim/simulator/prefetcher.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _PREFETCHER_H_ -#define _PREFETCHER_H_ 1 +#define _PREFETCHER_H_ #include "caching_device.h" #include "memref.h" diff --git a/clients/drcachesim/simulator/simulator.h b/clients/drcachesim/simulator/simulator.h index e156274d2d..720af087ba 100644 --- a/clients/drcachesim/simulator/simulator.h +++ b/clients/drcachesim/simulator/simulator.h @@ -34,7 +34,7 @@ */ #ifndef _SIMULATOR_H_ -#define _SIMULATOR_H_ 1 +#define _SIMULATOR_H_ #include #include diff --git a/clients/drcachesim/simulator/snoop_filter.h b/clients/drcachesim/simulator/snoop_filter.h index 709b4d891a..d612222984 100644 --- a/clients/drcachesim/simulator/snoop_filter.h +++ b/clients/drcachesim/simulator/snoop_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _SNOOP_FILTER_H_ -#define _SNOOP_FILTER_H_ 1 +#define _SNOOP_FILTER_H_ #include diff --git a/clients/drcachesim/simulator/tlb.h b/clients/drcachesim/simulator/tlb.h index 1b3b46d42e..15f08fd2f8 100644 --- a/clients/drcachesim/simulator/tlb.h +++ b/clients/drcachesim/simulator/tlb.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _TLB_H_ -#define _TLB_H_ 1 +#define _TLB_H_ #include #include diff --git a/clients/drcachesim/simulator/tlb_entry.h b/clients/drcachesim/simulator/tlb_entry.h index 951a3e8f10..864c86a908 100644 --- a/clients/drcachesim/simulator/tlb_entry.h +++ b/clients/drcachesim/simulator/tlb_entry.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _TLB_ENTRY_H_ -#define _TLB_ENTRY_H_ 1 +#define _TLB_ENTRY_H_ #include "caching_device_block.h" diff --git a/clients/drcachesim/simulator/tlb_simulator.h b/clients/drcachesim/simulator/tlb_simulator.h index e8f8f9b133..0e3a1991eb 100644 --- a/clients/drcachesim/simulator/tlb_simulator.h +++ b/clients/drcachesim/simulator/tlb_simulator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _TLB_SIMULATOR_H_ -#define _TLB_SIMULATOR_H_ 1 +#define _TLB_SIMULATOR_H_ #include #include diff --git a/clients/drcachesim/simulator/tlb_simulator_create.h b/clients/drcachesim/simulator/tlb_simulator_create.h index 74365ca7c9..44c5525e65 100644 --- a/clients/drcachesim/simulator/tlb_simulator_create.h +++ b/clients/drcachesim/simulator/tlb_simulator_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2023 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* tlb simulator creation */ #ifndef _TLB_SIMULATOR_CREATE_H_ -#define _TLB_SIMULATOR_CREATE_H_ 1 +#define _TLB_SIMULATOR_CREATE_H_ #include #include "analysis_tool.h" diff --git a/clients/drcachesim/simulator/tlb_stats.h b/clients/drcachesim/simulator/tlb_stats.h index 31f2287e6a..5cf870e466 100644 --- a/clients/drcachesim/simulator/tlb_stats.h +++ b/clients/drcachesim/simulator/tlb_stats.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _TLB_STATS_H_ -#define _TLB_STATS_H_ 1 +#define _TLB_STATS_H_ #include "caching_device_stats.h" diff --git a/clients/drcachesim/tests/cache_replacement_policy_unit_test.h b/clients/drcachesim/tests/cache_replacement_policy_unit_test.h index 43ab55fcbf..b07d0196d1 100644 --- a/clients/drcachesim/tests/cache_replacement_policy_unit_test.h +++ b/clients/drcachesim/tests/cache_replacement_policy_unit_test.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2023 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CACHE_REPLACEMENT_POLICY_UNIT_TEST_H_ -#define _CACHE_REPLACEMENT_POLICY_UNIT_TEST_H_ 1 +#define _CACHE_REPLACEMENT_POLICY_UNIT_TEST_H_ namespace dynamorio { namespace drmemtrace { diff --git a/clients/drcachesim/tests/config_reader_unit_test.h b/clients/drcachesim/tests/config_reader_unit_test.h index a5b7b7be06..24df5a5057 100644 --- a/clients/drcachesim/tests/config_reader_unit_test.h +++ b/clients/drcachesim/tests/config_reader_unit_test.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2023 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CONFIG_READER_UNIT_TEST_H_ -#define _CONFIG_READER_UNIT_TEST_H_ 1 +#define _CONFIG_READER_UNIT_TEST_H_ #include diff --git a/clients/drcachesim/tests/memref_gen.h b/clients/drcachesim/tests/memref_gen.h index 964d274100..4ff27789ee 100644 --- a/clients/drcachesim/tests/memref_gen.h +++ b/clients/drcachesim/tests/memref_gen.h @@ -31,7 +31,7 @@ */ #ifndef _MEMREF_GEN_ -#define _MEMREF_GEN_ 1 +#define _MEMREF_GEN_ #include "memref.h" #include "dr_api.h" diff --git a/clients/drcachesim/tests/mock_reader.h b/clients/drcachesim/tests/mock_reader.h index 7d8a9bb35a..1eb38d95df 100644 --- a/clients/drcachesim/tests/mock_reader.h +++ b/clients/drcachesim/tests/mock_reader.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2024 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* A mock reader that iterates over a vector of trace_entry_t, for tests. */ #ifndef _MOCK_READER_H_ -#define _MOCK_READER_H_ 1 +#define _MOCK_READER_H_ #include diff --git a/clients/drcachesim/tests/prefetch_analyzer.h b/clients/drcachesim/tests/prefetch_analyzer.h index abdbef0727..6363b7d9ee 100644 --- a/clients/drcachesim/tests/prefetch_analyzer.h +++ b/clients/drcachesim/tests/prefetch_analyzer.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _PREFETCH_ANALYZER_H_ -#define _PREFETCH_ANALYZER_H_ 1 +#define _PREFETCH_ANALYZER_H_ #include "../analysis_tool.h" #include "../common/memref.h" diff --git a/clients/drcachesim/tests/test_helpers.h b/clients/drcachesim/tests/test_helpers.h index b454f27ed9..b9155880dc 100644 --- a/clients/drcachesim/tests/test_helpers.h +++ b/clients/drcachesim/tests/test_helpers.h @@ -35,7 +35,7 @@ */ #ifndef _TEST_HELPERS_H_ -#define _TEST_HELPERS_H_ 1 +#define _TEST_HELPERS_H_ #ifdef NDEBUG # error NDEBUG should not be set for tests. diff --git a/clients/drcachesim/tests/tlb_simulator_unit_test.h b/clients/drcachesim/tests/tlb_simulator_unit_test.h index 417638b515..2614a71f86 100644 --- a/clients/drcachesim/tests/tlb_simulator_unit_test.h +++ b/clients/drcachesim/tests/tlb_simulator_unit_test.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _TLB_SIMULATOR_UNIT_TEST_H_ -#define _TLB_SIMULATOR_UNIT_TEST_H_ 1 +#define _TLB_SIMULATOR_UNIT_TEST_H_ #include diff --git a/clients/drcachesim/tests/v2p_reader_unit_test.h b/clients/drcachesim/tests/v2p_reader_unit_test.h index 6d53a28e42..de299d7cd7 100644 --- a/clients/drcachesim/tests/v2p_reader_unit_test.h +++ b/clients/drcachesim/tests/v2p_reader_unit_test.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _V2P_READER_UNIT_TEST_H_ -#define _V2P_READER_UNIT_TEST_H_ 1 +#define _V2P_READER_UNIT_TEST_H_ #include diff --git a/clients/drcachesim/tools/basic_counts.h b/clients/drcachesim/tools/basic_counts.h index 28a1d35ec4..f4de592efc 100644 --- a/clients/drcachesim/tools/basic_counts.h +++ b/clients/drcachesim/tools/basic_counts.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2024 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _BASIC_COUNTS_H_ -#define _BASIC_COUNTS_H_ 1 +#define _BASIC_COUNTS_H_ #include diff --git a/clients/drcachesim/tools/basic_counts_create.h b/clients/drcachesim/tools/basic_counts_create.h index 477bf47f86..e73bb45e38 100644 --- a/clients/drcachesim/tools/basic_counts_create.h +++ b/clients/drcachesim/tools/basic_counts_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* basic-counts tool creation */ #ifndef _BASIC_COUNTS_CREATE_H_ -#define _BASIC_COUNTS_CREATE_H_ 1 +#define _BASIC_COUNTS_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/common/decode_cache.h b/clients/drcachesim/tools/common/decode_cache.h index 1b774132e6..b72360fec6 100644 --- a/clients/drcachesim/tools/common/decode_cache.h +++ b/clients/drcachesim/tools/common/decode_cache.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2025 Google, Inc. All rights reserved. + * Copyright (c) 2025-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -42,7 +42,7 @@ */ #ifndef _DECODE_CACHE_H_ -#define _DECODE_CACHE_H_ 1 +#define _DECODE_CACHE_H_ #include "memref.h" #include "raw2trace_shared.h" diff --git a/clients/drcachesim/tools/external/example/empty.h b/clients/drcachesim/tools/external/example/empty.h index 1aec3744f0..18499346b5 100644 --- a/clients/drcachesim/tools/external/example/empty.h +++ b/clients/drcachesim/tools/external/example/empty.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* external analysis tool example. */ #ifndef _EMPTY_H_ -#define _EMPTY_H_ 1 +#define _EMPTY_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/external/example/empty_create.h b/clients/drcachesim/tools/external/example/empty_create.h index 6f64207262..1e527bb687 100644 --- a/clients/drcachesim/tools/external/example/empty_create.h +++ b/clients/drcachesim/tools/external/example/empty_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* example tool creation */ #ifndef _EMPTY_CREATE_H_ -#define _EMPTY_CREATE_H_ 1 +#define _EMPTY_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/filter/cache_filter.h b/clients/drcachesim/tools/filter/cache_filter.h index d94152b6c1..23aa831646 100644 --- a/clients/drcachesim/tools/filter/cache_filter.h +++ b/clients/drcachesim/tools/filter/cache_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2023 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _CACHE_FILTER_H_ -#define _CACHE_FILTER_H_ 1 +#define _CACHE_FILTER_H_ #include "memtrace_stream.h" #include "record_filter.h" diff --git a/clients/drcachesim/tools/filter/encodings2regdeps_filter.h b/clients/drcachesim/tools/filter/encodings2regdeps_filter.h index b4387cead4..13f3d1b9fc 100644 --- a/clients/drcachesim/tools/filter/encodings2regdeps_filter.h +++ b/clients/drcachesim/tools/filter/encodings2regdeps_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _ENCODING_FILTER_H_ -#define _ENCODING_FILTER_H_ 1 +#define _ENCODING_FILTER_H_ #include "record_filter.h" #include "trace_entry.h" diff --git a/clients/drcachesim/tools/filter/func_id_filter.h b/clients/drcachesim/tools/filter/func_id_filter.h index 08501827d2..4b29c27bf7 100644 --- a/clients/drcachesim/tools/filter/func_id_filter.h +++ b/clients/drcachesim/tools/filter/func_id_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _FUNC_ID_FILTER_H_ -#define _FUNC_ID_FILTER_H_ 1 +#define _FUNC_ID_FILTER_H_ #include "record_filter.h" #include "trace_entry.h" diff --git a/clients/drcachesim/tools/filter/modify_marker_value_filter.h b/clients/drcachesim/tools/filter/modify_marker_value_filter.h index 7833ba7682..a4ee27df0e 100644 --- a/clients/drcachesim/tools/filter/modify_marker_value_filter.h +++ b/clients/drcachesim/tools/filter/modify_marker_value_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _MODIFY_MARKER_VALUE_FILTER_H_ -#define _MODIFY_MARKER_VALUE_FILTER_H_ 1 +#define _MODIFY_MARKER_VALUE_FILTER_H_ #include "record_filter.h" #include "trace_entry.h" diff --git a/clients/drcachesim/tools/filter/null_filter.h b/clients/drcachesim/tools/filter/null_filter.h index 9ebf5377bd..51cf801a47 100644 --- a/clients/drcachesim/tools/filter/null_filter.h +++ b/clients/drcachesim/tools/filter/null_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _NULL_FILTER_H_ -#define _NULL_FILTER_H_ 1 +#define _NULL_FILTER_H_ #include "record_filter.h" diff --git a/clients/drcachesim/tools/filter/record_filter.h b/clients/drcachesim/tools/filter/record_filter.h index 216b6b8af0..5edb5aea26 100644 --- a/clients/drcachesim/tools/filter/record_filter.h +++ b/clients/drcachesim/tools/filter/record_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _RECORD_FILTER_H_ -#define _RECORD_FILTER_H_ 1 +#define _RECORD_FILTER_H_ #include diff --git a/clients/drcachesim/tools/filter/record_filter_create.h b/clients/drcachesim/tools/filter/record_filter_create.h index e44b6806dd..c950e9508d 100644 --- a/clients/drcachesim/tools/filter/record_filter_create.h +++ b/clients/drcachesim/tools/filter/record_filter_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _RECORD_FILTER_CREATE_H_ -#define _RECORD_FILTER_CREATE_H_ 1 +#define _RECORD_FILTER_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/filter/trim_filter.h b/clients/drcachesim/tools/filter/trim_filter.h index 7063094ceb..6b0e15711b 100644 --- a/clients/drcachesim/tools/filter/trim_filter.h +++ b/clients/drcachesim/tools/filter/trim_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _TRIM_FILTER_H_ -#define _TRIM_FILTER_H_ 1 +#define _TRIM_FILTER_H_ #include "record_filter.h" #include "trace_entry.h" diff --git a/clients/drcachesim/tools/filter/type_filter.h b/clients/drcachesim/tools/filter/type_filter.h index 48d6aaef1d..836ca1b09a 100644 --- a/clients/drcachesim/tools/filter/type_filter.h +++ b/clients/drcachesim/tools/filter/type_filter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2024 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _TYPE_FILTER_H_ -#define _TYPE_FILTER_H_ 1 +#define _TYPE_FILTER_H_ #include "record_filter.h" #include "trace_entry.h" diff --git a/clients/drcachesim/tools/func_view.h b/clients/drcachesim/tools/func_view.h index 24e0a381fd..8ce2c0ef32 100644 --- a/clients/drcachesim/tools/func_view.h +++ b/clients/drcachesim/tools/func_view.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020-2024 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _FUNC_VIEW_H_ -#define _FUNC_VIEW_H_ 1 +#define _FUNC_VIEW_H_ #include #include diff --git a/clients/drcachesim/tools/func_view_create.h b/clients/drcachesim/tools/func_view_create.h index f1933a39c3..fa1077bf3a 100644 --- a/clients/drcachesim/tools/func_view_create.h +++ b/clients/drcachesim/tools/func_view_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* func_view tool creation */ #ifndef _FUNC_VIEW_CREATE_H_ -#define _FUNC_VIEW_CREATE_H_ 1 +#define _FUNC_VIEW_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/histogram.h b/clients/drcachesim/tools/histogram.h index 98ec03a1d1..687c81fae9 100644 --- a/clients/drcachesim/tools/histogram.h +++ b/clients/drcachesim/tools/histogram.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2024 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _HISTOGRAM_H_ -#define _HISTOGRAM_H_ 1 +#define _HISTOGRAM_H_ #include #include diff --git a/clients/drcachesim/tools/histogram_create.h b/clients/drcachesim/tools/histogram_create.h index 8b5e6dc707..0471bfa24c 100644 --- a/clients/drcachesim/tools/histogram_create.h +++ b/clients/drcachesim/tools/histogram_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* histogram tool creation */ #ifndef _HISTOGRAM_CREATE_H_ -#define _HISTOGRAM_CREATE_H_ 1 +#define _HISTOGRAM_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/invariant_checker.h b/clients/drcachesim/tools/invariant_checker.h index ce54a8852c..4602e94c21 100644 --- a/clients/drcachesim/tools/invariant_checker.h +++ b/clients/drcachesim/tools/invariant_checker.h @@ -34,7 +34,7 @@ */ #ifndef _INVARIANT_CHECKER_H_ -#define _INVARIANT_CHECKER_H_ 1 +#define _INVARIANT_CHECKER_H_ #include diff --git a/clients/drcachesim/tools/invariant_checker_create.h b/clients/drcachesim/tools/invariant_checker_create.h index 38780d1c13..010edc559f 100644 --- a/clients/drcachesim/tools/invariant_checker_create.h +++ b/clients/drcachesim/tools/invariant_checker_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2021 Google, Inc. All rights reserved. + * Copyright (c) 2021-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _INVARIANT_CHECKER_CREATE_H_ -#define _INVARIANT_CHECKER_CREATE_H_ 1 +#define _INVARIANT_CHECKER_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/loader/dynamic_lib.h b/clients/drcachesim/tools/loader/dynamic_lib.h index 82dc20851b..4677b175b8 100644 --- a/clients/drcachesim/tools/loader/dynamic_lib.h +++ b/clients/drcachesim/tools/loader/dynamic_lib.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _DYNAMIC_LIB_H_ -#define _DYNAMIC_LIB_H_ 1 +#define _DYNAMIC_LIB_H_ #ifdef UNIX # include diff --git a/clients/drcachesim/tools/loader/external_config_file.h b/clients/drcachesim/tools/loader/external_config_file.h index 12fb2bee82..8038576969 100644 --- a/clients/drcachesim/tools/loader/external_config_file.h +++ b/clients/drcachesim/tools/loader/external_config_file.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _EXTERNAL_TOOL_CONFIG_FILE_H_ -#define _EXTERNAL_TOOL_CONFIG_FILE_H_ 1 +#define _EXTERNAL_TOOL_CONFIG_FILE_H_ #include diff --git a/clients/drcachesim/tools/loader/external_tool_creator.h b/clients/drcachesim/tools/loader/external_tool_creator.h index cfdc19d3b2..2532e28c47 100644 --- a/clients/drcachesim/tools/loader/external_tool_creator.h +++ b/clients/drcachesim/tools/loader/external_tool_creator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _EXTERNAL_TOOL_CREATOR_H_ -#define _EXTERNAL_TOOL_CREATOR_H_ 1 +#define _EXTERNAL_TOOL_CREATOR_H_ #include "analysis_tool.h" #include "dynamic_lib.h" diff --git a/clients/drcachesim/tools/opcode_mix.h b/clients/drcachesim/tools/opcode_mix.h index c38928deea..82e58eed33 100644 --- a/clients/drcachesim/tools/opcode_mix.h +++ b/clients/drcachesim/tools/opcode_mix.h @@ -31,7 +31,7 @@ */ #ifndef _OPCODE_MIX_H_ -#define _OPCODE_MIX_H_ 1 +#define _OPCODE_MIX_H_ #include #include diff --git a/clients/drcachesim/tools/opcode_mix_create.h b/clients/drcachesim/tools/opcode_mix_create.h index d398d295b1..42255ccc23 100644 --- a/clients/drcachesim/tools/opcode_mix_create.h +++ b/clients/drcachesim/tools/opcode_mix_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* opcode-mix tool creation */ #ifndef _OPCODE_MIX_CREATE_H_ -#define _OPCODE_MIX_CREATE_H_ 1 +#define _OPCODE_MIX_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/reuse_distance.h b/clients/drcachesim/tools/reuse_distance.h index 0a69426c11..449930c23d 100644 --- a/clients/drcachesim/tools/reuse_distance.h +++ b/clients/drcachesim/tools/reuse_distance.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2024 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _REUSE_DISTANCE_H_ -#define _REUSE_DISTANCE_H_ 1 +#define _REUSE_DISTANCE_H_ #include #include diff --git a/clients/drcachesim/tools/reuse_distance_create.h b/clients/drcachesim/tools/reuse_distance_create.h index f5b8662d46..6b5d93ff02 100644 --- a/clients/drcachesim/tools/reuse_distance_create.h +++ b/clients/drcachesim/tools/reuse_distance_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* reuse-distance tool creation */ #ifndef _REUSE_DISTANCE_CREATE_H_ -#define _REUSE_DISTANCE_CREATE_H_ 1 +#define _REUSE_DISTANCE_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/reuse_time.h b/clients/drcachesim/tools/reuse_time.h index ff64e73b7c..e1f1975450 100644 --- a/clients/drcachesim/tools/reuse_time.h +++ b/clients/drcachesim/tools/reuse_time.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2024 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _REUSE_TIME_H_ -#define _REUSE_TIME_H_ 1 +#define _REUSE_TIME_H_ #include diff --git a/clients/drcachesim/tools/reuse_time_create.h b/clients/drcachesim/tools/reuse_time_create.h index c3cc8b6ed2..682fe36ce5 100644 --- a/clients/drcachesim/tools/reuse_time_create.h +++ b/clients/drcachesim/tools/reuse_time_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* reuse-distance tool creation */ #ifndef _REUSE_TIME_CREATE_H_ -#define _REUSE_TIME_CREATE_H_ 1 +#define _REUSE_TIME_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/schedule_stats.h b/clients/drcachesim/tools/schedule_stats.h index df7adbbb48..c9f4b1c1a4 100644 --- a/clients/drcachesim/tools/schedule_stats.h +++ b/clients/drcachesim/tools/schedule_stats.h @@ -31,7 +31,7 @@ */ #ifndef _SCHEDULE_STATS_H_ -#define _SCHEDULE_STATS_H_ 1 +#define _SCHEDULE_STATS_H_ #include diff --git a/clients/drcachesim/tools/schedule_stats_create.h b/clients/drcachesim/tools/schedule_stats_create.h index b5db7770ae..4154ea49c6 100644 --- a/clients/drcachesim/tools/schedule_stats_create.h +++ b/clients/drcachesim/tools/schedule_stats_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* Schedule stats tool creation. */ #ifndef _SCHEDULE_STATS_CREATE_H_ -#define _SCHEDULE_STATS_CREATE_H_ 1 +#define _SCHEDULE_STATS_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/syscall_mix.h b/clients/drcachesim/tools/syscall_mix.h index d1b5e7a028..170c1876b2 100644 --- a/clients/drcachesim/tools/syscall_mix.h +++ b/clients/drcachesim/tools/syscall_mix.h @@ -31,7 +31,7 @@ */ #ifndef _SYSCALL_MIX_H_ -#define _SYSCALL_MIX_H_ 1 +#define _SYSCALL_MIX_H_ #include diff --git a/clients/drcachesim/tools/syscall_mix_create.h b/clients/drcachesim/tools/syscall_mix_create.h index 7747d92c15..97936e10bc 100644 --- a/clients/drcachesim/tools/syscall_mix_create.h +++ b/clients/drcachesim/tools/syscall_mix_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* syscall-mix tool creation */ #ifndef _SYSCALL_MIX_CREATE_H_ -#define _SYSCALL_MIX_CREATE_H_ 1 +#define _SYSCALL_MIX_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tools/view.h b/clients/drcachesim/tools/view.h index a507aeeafa..f3a88f342b 100644 --- a/clients/drcachesim/tools/view.h +++ b/clients/drcachesim/tools/view.h @@ -31,7 +31,7 @@ */ #ifndef _VIEW_H_ -#define _VIEW_H_ 1 +#define _VIEW_H_ #include diff --git a/clients/drcachesim/tools/view_create.h b/clients/drcachesim/tools/view_create.h index 9e6f39ac20..13e27ddb0a 100644 --- a/clients/drcachesim/tools/view_create.h +++ b/clients/drcachesim/tools/view_create.h @@ -33,7 +33,7 @@ /* view tool creation */ #ifndef _VIEW_CREATE_H_ -#define _VIEW_CREATE_H_ 1 +#define _VIEW_CREATE_H_ #include "analysis_tool.h" diff --git a/clients/drcachesim/tracer/dr_allocator.h b/clients/drcachesim/tracer/dr_allocator.h index 3c6397e00c..39626bdf82 100644 --- a/clients/drcachesim/tracer/dr_allocator.h +++ b/clients/drcachesim/tracer/dr_allocator.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2023 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _DR_ALLOCATOR_H_ -#define _DR_ALLOCATOR_H_ 1 +#define _DR_ALLOCATOR_H_ #include "dr_api.h" #include diff --git a/clients/drcachesim/tracer/drmemtrace.h b/clients/drcachesim/tracer/drmemtrace.h index 112786a41e..e749fe6086 100644 --- a/clients/drcachesim/tracer/drmemtrace.h +++ b/clients/drcachesim/tracer/drmemtrace.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2023 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -37,7 +37,7 @@ */ #ifndef _DRMEMTRACE_H_ -#define _DRMEMTRACE_H_ 1 +#define _DRMEMTRACE_H_ /** * @file drmemtrace.h diff --git a/clients/drcachesim/tracer/func_trace.h b/clients/drcachesim/tracer/func_trace.h index 4a6ee8322d..351ed5dec2 100644 --- a/clients/drcachesim/tracer/func_trace.h +++ b/clients/drcachesim/tracer/func_trace.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2023 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ // func_trace.h: header of module for recording function traces #ifndef _FUNC_TRACE_ -#define _FUNC_TRACE_ 1 +#define _FUNC_TRACE_ #include #include diff --git a/clients/drcachesim/tracer/instr_counter.h b/clients/drcachesim/tracer/instr_counter.h index 95b242dcf0..97c96e0857 100644 --- a/clients/drcachesim/tracer/instr_counter.h +++ b/clients/drcachesim/tracer/instr_counter.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2023 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2010 Massachusetts Institute of Technology All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _INSTR_COUNTER_ -#define _INSTR_COUNTER_ 1 +#define _INSTR_COUNTER_ #include diff --git a/clients/drcachesim/tracer/instru.h b/clients/drcachesim/tracer/instru.h index 1a7230276b..b0b428b6be 100644 --- a/clients/drcachesim/tracer/instru.h +++ b/clients/drcachesim/tracer/instru.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2023 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _INSTRU_H_ -#define _INSTRU_H_ 1 +#define _INSTRU_H_ #include #include diff --git a/clients/drcachesim/tracer/kcore_copy.h b/clients/drcachesim/tracer/kcore_copy.h index 8be4cfc7f9..6821f48267 100644 --- a/clients/drcachesim/tracer/kcore_copy.h +++ b/clients/drcachesim/tracer/kcore_copy.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2022-2023 Google, Inc. All rights reserved. + * Copyright (c) 2022-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _KCORE_COPY_H_ -#define _KCORE_COPY_H_ 1 +#define _KCORE_COPY_H_ #include diff --git a/clients/drcachesim/tracer/output.h b/clients/drcachesim/tracer/output.h index f86810e0dc..40f0e9f37d 100644 --- a/clients/drcachesim/tracer/output.h +++ b/clients/drcachesim/tracer/output.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2023 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2010 Massachusetts Institute of Technology All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _OUTPUT_ -#define _OUTPUT_ 1 +#define _OUTPUT_ #include "dr_api.h" #include "tracer.h" diff --git a/clients/drcachesim/tracer/physaddr.h b/clients/drcachesim/tracer/physaddr.h index b42330f09e..efd7de3ad1 100644 --- a/clients/drcachesim/tracer/physaddr.h +++ b/clients/drcachesim/tracer/physaddr.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _PHYSADDR_H_ -#define _PHYSADDR_H_ 1 +#define _PHYSADDR_H_ #include #include diff --git a/clients/drcachesim/tracer/raw2trace.h b/clients/drcachesim/tracer/raw2trace.h index 2dcb9afa6f..ceede8bce9 100644 --- a/clients/drcachesim/tracer/raw2trace.h +++ b/clients/drcachesim/tracer/raw2trace.h @@ -34,7 +34,7 @@ */ #ifndef _RAW2TRACE_H_ -#define _RAW2TRACE_H_ 1 +#define _RAW2TRACE_H_ /** * @file drmemtrace/raw2trace.h diff --git a/clients/drcachesim/tracer/raw2trace_directory.h b/clients/drcachesim/tracer/raw2trace_directory.h index c8de4f3092..32a398b231 100644 --- a/clients/drcachesim/tracer/raw2trace_directory.h +++ b/clients/drcachesim/tracer/raw2trace_directory.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2017-2024 Google, Inc. All rights reserved. + * Copyright (c) 2017-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _RAW2TRACE_DIRECTORY_H_ -#define _RAW2TRACE_DIRECTORY_H_ 1 +#define _RAW2TRACE_DIRECTORY_H_ #include #include diff --git a/clients/drcachesim/tracer/raw2trace_shared.h b/clients/drcachesim/tracer/raw2trace_shared.h index f0446c3c1a..08398ae041 100644 --- a/clients/drcachesim/tracer/raw2trace_shared.h +++ b/clients/drcachesim/tracer/raw2trace_shared.h @@ -34,7 +34,7 @@ */ #ifndef _RAW2TRACE_SHARED_H_ -#define _RAW2TRACE_SHARED_H_ 1 +#define _RAW2TRACE_SHARED_H_ /** * @file drmemtrace/raw2trace_shared.h diff --git a/clients/drcachesim/tracer/snappy_file_writer.h b/clients/drcachesim/tracer/snappy_file_writer.h index 646fde2ede..5af45ed8fa 100644 --- a/clients/drcachesim/tracer/snappy_file_writer.h +++ b/clients/drcachesim/tracer/snappy_file_writer.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2019-2023 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -53,7 +53,7 @@ */ #ifndef _SNAPPY_FILE_WRITER_H_ -#define _SNAPPY_FILE_WRITER_H_ 1 +#define _SNAPPY_FILE_WRITER_H_ #include #include "snappy_consts.h" diff --git a/clients/drcachesim/tracer/syscall_pt_trace.h b/clients/drcachesim/tracer/syscall_pt_trace.h index 108474b886..6ce5a02b10 100644 --- a/clients/drcachesim/tracer/syscall_pt_trace.h +++ b/clients/drcachesim/tracer/syscall_pt_trace.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023-2024 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -34,7 +34,7 @@ */ #ifndef _SYSCALL_PT_TRACE_ -#define _SYSCALL_PT_TRACE_ 1 +#define _SYSCALL_PT_TRACE_ #include #include diff --git a/clients/drcachesim/tracer/tracer.h b/clients/drcachesim/tracer/tracer.h index b18a0077a1..f336f1198e 100644 --- a/clients/drcachesim/tracer/tracer.h +++ b/clients/drcachesim/tracer/tracer.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2023 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2010 Massachusetts Institute of Technology All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _TRACER_ -#define _TRACER_ 1 +#define _TRACER_ #include diff --git a/clients/drcpusim/options.h b/clients/drcpusim/options.h index 4c4bc075ad..2d43be0f2c 100644 --- a/clients/drcpusim/options.h +++ b/clients/drcpusim/options.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2023 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* shared options for both the client and the documentation */ #ifndef _OPTIONS_H_ -#define _OPTIONS_H_ 1 +#define _OPTIONS_H_ #include #include "droption.h" diff --git a/core/annotations.h b/core/annotations.h index e52cda01a2..e4e927eea5 100644 --- a/core/annotations.h +++ b/core/annotations.h @@ -1,5 +1,5 @@ /* ****************************************************** - * Copyright (c) 2014-2021 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * ******************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _ANNOTATIONS_H_ -#define _ANNOTATIONS_H_ 1 +#define _ANNOTATIONS_H_ #ifdef ANNOTATIONS /* around whole file */ diff --git a/core/annotations_api.h b/core/annotations_api.h index 749dfa8a42..042e6c80c9 100644 --- a/core/annotations_api.h +++ b/core/annotations_api.h @@ -31,7 +31,7 @@ */ #ifndef _DR_ANNOTATION_H_ -#define _DR_ANNOTATION_H_ 1 +#define _DR_ANNOTATION_H_ #include "dr_tools.h" diff --git a/core/arch/arch_exports.h b/core/arch/arch_exports.h index 603d06d886..270942fcde 100644 --- a/core/arch/arch_exports.h +++ b/core/arch/arch_exports.h @@ -44,7 +44,7 @@ */ #ifndef _ARCH_EXPORTS_H_ -#define _ARCH_EXPORTS_H_ 1 +#define _ARCH_EXPORTS_H_ /* We export all of opnd.h for reg_id_t, DR_NUM_GPR_REGS, etc. */ #include "opnd.h" diff --git a/core/arch/asm_defines.asm b/core/arch/asm_defines.asm index 5a5f700669..bcf508e8a9 100644 --- a/core/arch/asm_defines.asm +++ b/core/arch/asm_defines.asm @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2023 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2009 VMware, Inc. All rights reserved. * ********************************************************** */ @@ -32,7 +32,7 @@ */ #ifndef _ASM_DEFINES_ASM_ -#define _ASM_DEFINES_ASM_ 1 +#define _ASM_DEFINES_ASM_ /* Preprocessor macro definitions shared among all .asm files. * Since cpp macros can't generate newlines and #s we have a later diff --git a/core/arch/atomic_exports.h b/core/arch/atomic_exports.h index f374b515ba..8adae81b4f 100644 --- a/core/arch/atomic_exports.h +++ b/core/arch/atomic_exports.h @@ -41,7 +41,7 @@ */ #ifndef _ATOMIC_EXPORTS_H_ -#define _ATOMIC_EXPORTS_H_ 1 +#define _ATOMIC_EXPORTS_H_ /* We use this to ensure that linking and unlinking is atomic with respect * to a thread in the cache, this is needed for our current flushing diff --git a/core/arch/clean_call_opt.h b/core/arch/clean_call_opt.h index 30944a35c8..44e795eb6a 100644 --- a/core/arch/clean_call_opt.h +++ b/core/arch/clean_call_opt.h @@ -33,7 +33,7 @@ /* file "clean_call_opt.h" - arch-specific clean call optimisation */ #ifndef _CLEAN_CALL_OPT_ -#define _CLEAN_CALL_OPT_ 1 +#define _CLEAN_CALL_OPT_ /**************************************************************************** * Functions provided by clean_call_opt_shared.c. diff --git a/core/arch/proc.h b/core/arch/proc.h index d8a1809d20..2ef1eb2a1e 100644 --- a/core/arch/proc.h +++ b/core/arch/proc.h @@ -40,7 +40,7 @@ */ #ifndef _PROC_H_ -#define _PROC_H_ 1 +#define _PROC_H_ #include "proc_api.h" diff --git a/core/arch/proc_api.h b/core/arch/proc_api.h index 49cc607880..1d20905e13 100644 --- a/core/arch/proc_api.h +++ b/core/arch/proc_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2022 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_PROC_H_ -#define _DR_PROC_H_ 1 +#define _DR_PROC_H_ /**************************************************************************** * PROCESSOR-SPECIFIC UTILITY ROUTINES AND CONSTANTS diff --git a/core/arch/sideline.h b/core/arch/sideline.h index f09ef7a984..7f2f918369 100644 --- a/core/arch/sideline.h +++ b/core/arch/sideline.h @@ -38,7 +38,7 @@ */ #ifndef _SIDELINE_H_ -#define _SIDELINE_H_ 1 +#define _SIDELINE_H_ /* sampled by sideline thread to find hot traces */ extern volatile fragment_t *sideline_trace; diff --git a/core/arch/x86/x86_asm_defines.asm b/core/arch/x86/x86_asm_defines.asm index 03d8f98496..5bc5aec60a 100644 --- a/core/arch/x86/x86_asm_defines.asm +++ b/core/arch/x86/x86_asm_defines.asm @@ -40,7 +40,7 @@ */ #ifndef _X86_ASM_DEFINES_ASM_ -#define _X86_ASM_DEFINES_ASM_ 1 +#define _X86_ASM_DEFINES_ASM_ /* We should give asm_defines.asm all unique names and then include globals.h * and avoid all this duplication! diff --git a/core/config.h b/core/config.h index 605412fa70..a6f44acc3a 100644 --- a/core/config.h +++ b/core/config.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2019 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * Copyright (c) 2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -36,7 +36,7 @@ */ #ifndef _CONFIG_H_ -#define _CONFIG_H_ 1 +#define _CONFIG_H_ #include "dr_config.h" /* for dr_platform_t */ diff --git a/core/dispatch.h b/core/dispatch.h index ed90d7ca06..09d7a6c14b 100644 --- a/core/dispatch.h +++ b/core/dispatch.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016-2019 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2008 VMware, Inc. All rights reserved. * **********************************************************/ @@ -38,7 +38,7 @@ /* file "dispatch.h" */ #ifndef _DISPATCH_H_ -#define _DISPATCH_H_ 1 +#define _DISPATCH_H_ /* returns true if pc is a point at which DynamoRIO should stop interpreting */ bool diff --git a/core/drlibc/drlibc.h b/core/drlibc/drlibc.h index 09ec0c61a5..51e46df984 100644 --- a/core/drlibc/drlibc.h +++ b/core/drlibc/drlibc.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2022 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -38,7 +38,7 @@ /* header for library of core utilites shared with non-core: "drlibc" */ #ifndef _DR_LIBC_H_ -#define _DR_LIBC_H_ 1 +#define _DR_LIBC_H_ #ifdef UNIX /* _LARGEFILE64_SOURCE should make libc struct match kernel. */ diff --git a/core/drlibc/drlibc_unix.h b/core/drlibc/drlibc_unix.h index 562d9cdd4e..4e087ac54a 100644 --- a/core/drlibc/drlibc_unix.h +++ b/core/drlibc/drlibc_unix.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2020 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -37,7 +37,7 @@ */ #ifndef _DRLIBC_UNIX_H_ -#define _DRLIBC_UNIX_H_ 1 +#define _DRLIBC_UNIX_H_ /* Cross arch syscall nums for use with struct stat64. */ #ifdef MACOS64 diff --git a/core/emit.h b/core/emit.h index 547b62b448..ad6a6b77e0 100644 --- a/core/emit.h +++ b/core/emit.h @@ -39,7 +39,7 @@ */ #ifndef _EMIT_H_ -#define _EMIT_H_ 1 +#define _EMIT_H_ /* Emits code for ilist into the fcache, returns the created * fragment. Adds the fragment to the fragment hashtable and diff --git a/core/fcache.h b/core/fcache.h index 219a7e3635..7f2c24a48b 100644 --- a/core/fcache.h +++ b/core/fcache.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2018-2019 Google, Inc. All rights reserved. + * Copyright (c) 2018-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2008 VMware, Inc. All rights reserved. * **********************************************************/ @@ -40,7 +40,7 @@ */ #ifndef _FCACHE_H_ -#define _FCACHE_H_ 1 +#define _FCACHE_H_ /* who's in the "trace" cache? * when we have private traces we put temp-private bbs there (to avoid diff --git a/core/fragment.h b/core/fragment.h index d19e9396ca..c10e141f9c 100644 --- a/core/fragment.h +++ b/core/fragment.h @@ -40,7 +40,7 @@ */ #ifndef _FRAGMENT_H_ -#define _FRAGMENT_H_ 1 +#define _FRAGMENT_H_ #include "hashtable.h" #include "translate.h" diff --git a/core/fragment_api.h b/core/fragment_api.h index e1309a63fc..3464dd0d89 100644 --- a/core/fragment_api.h +++ b/core/fragment_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2021 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -36,7 +36,7 @@ /* Copyright (c) 2000-2001 Hewlett-Packard Company */ #ifndef _DR_TRACEDUMP_H_ -#define _DR_TRACEDUMP_H_ 1 +#define _DR_TRACEDUMP_H_ /** * @file dr_tracedump.h diff --git a/core/globals.h b/core/globals.h index e3505e8348..60446e069e 100644 --- a/core/globals.h +++ b/core/globals.h @@ -40,7 +40,7 @@ */ #ifndef _GLOBALS_H_ -#define _GLOBALS_H_ 1 +#define _GLOBALS_H_ #include "configure.h" // IWYU pragma: export diff --git a/core/hashtable.h b/core/hashtable.h index c9a5695001..884a31e4c1 100644 --- a/core/hashtable.h +++ b/core/hashtable.h @@ -41,7 +41,7 @@ */ #ifndef _HASHTABLE_H_ -#define _HASHTABLE_H_ 1 +#define _HASHTABLE_H_ /* Flags stored in the table_flags bitfield that are common to * all hashtables diff --git a/core/heap.h b/core/heap.h index c6cd95d874..e072f4d3d0 100644 --- a/core/heap.h +++ b/core/heap.h @@ -40,7 +40,7 @@ */ #ifndef _HEAP_H_ -#define _HEAP_H_ 1 +#define _HEAP_H_ #ifdef HEAP_ACCOUNTING typedef enum { diff --git a/core/hotpatch.h b/core/hotpatch.h index b385faa2cd..0d63019ea8 100644 --- a/core/hotpatch.h +++ b/core/hotpatch.h @@ -37,7 +37,7 @@ */ #ifndef _HOTPATCH_H_ -#define _HOTPATCH_H_ 1 +#define _HOTPATCH_H_ #ifdef HOT_PATCHING_INTERFACE /* Around the whole file */ diff --git a/core/ir/aarch64/build_ldstex.h b/core/ir/aarch64/build_ldstex.h index 73fd7da2b0..475da64860 100644 --- a/core/ir/aarch64/build_ldstex.h +++ b/core/ir/aarch64/build_ldstex.h @@ -31,7 +31,7 @@ */ #ifndef BUILD_LDSTEX_H -#define BUILD_LDSTEX_H 1 +#define BUILD_LDSTEX_H byte * decode_with_ldstex(dcontext_t *dcontext, byte *pc, instr_t *instr); diff --git a/core/ir/aarch64/codec.h b/core/ir/aarch64/codec.h index b5d47b8623..0acba5a192 100644 --- a/core/ir/aarch64/codec.h +++ b/core/ir/aarch64/codec.h @@ -31,7 +31,7 @@ */ #ifndef CODEC_H -#define CODEC_H 1 +#define CODEC_H #include "decode_private.h" diff --git a/core/ir/aarch64/decode_private.h b/core/ir/aarch64/decode_private.h index 1cf98a1167..bcd5ffb594 100644 --- a/core/ir/aarch64/decode_private.h +++ b/core/ir/aarch64/decode_private.h @@ -31,7 +31,7 @@ */ #ifndef DECODE_PRIVATE_H -#define DECODE_PRIVATE_H 1 +#define DECODE_PRIVATE_H struct _decode_info_t { bool check_reachable; /* This is used by the encoder, not the decoder. */ diff --git a/core/ir/aarch64/instr_create_api.h b/core/ir/aarch64/instr_create_api.h index 6306eeeacb..f80c898ed7 100644 --- a/core/ir/aarch64/instr_create_api.h +++ b/core/ir/aarch64/instr_create_api.h @@ -33,7 +33,7 @@ */ #ifndef DR_IR_MACROS_AARCH64_H -#define DR_IR_MACROS_AARCH64_H 1 +#define DR_IR_MACROS_AARCH64_H /** * Used in an additional immediate source operand to a vector operation, denotes diff --git a/core/ir/arm/instr_create_api.h b/core/ir/arm/instr_create_api.h index 32e8ad0eeb..8805d0e42c 100644 --- a/core/ir/arm/instr_create_api.h +++ b/core/ir/arm/instr_create_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2021 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -35,7 +35,7 @@ /* Copyright (c) 2002-2003 Massachusetts Institute of Technology */ #ifndef _DR_IR_MACROS_ARM_H_ -#define _DR_IR_MACROS_ARM_H_ 1 +#define _DR_IR_MACROS_ARM_H_ /** * @file dr_ir_macros_arm.h diff --git a/core/ir/arm/opcode_api.h b/core/ir/arm/opcode_api.h index 3aa155fea7..43a8c8e758 100644 --- a/core/ir/arm/opcode_api.h +++ b/core/ir/arm/opcode_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2014-2021 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DR_IR_OPCODES_ARM_H_ -#define _DR_IR_OPCODES_ARM_H_ 1 +#define _DR_IR_OPCODES_ARM_H_ /**************************************************************************** * OPCODES diff --git a/core/ir/decode_api.h b/core/ir/decode_api.h index a9ecf62eb5..a00ed8735f 100644 --- a/core/ir/decode_api.h +++ b/core/ir/decode_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_DECODE_H_ -#define _DR_IR_DECODE_H_ 1 +#define _DR_IR_DECODE_H_ /************************************************** * DECODING ROUTINES diff --git a/core/ir/disassemble_api.h b/core/ir/disassemble_api.h index 2a8d84eaa0..1ef86726ab 100644 --- a/core/ir/disassemble_api.h +++ b/core/ir/disassemble_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_DISASSEMBLE_H_ -#define _DR_IR_DISASSEMBLE_H_ 1 +#define _DR_IR_DISASSEMBLE_H_ /************************************************** * DISASSEMBLY ROUTINES diff --git a/core/ir/dr_ir_opcodes.h b/core/ir/dr_ir_opcodes.h index fb5f24f201..28e9311a2a 100644 --- a/core/ir/dr_ir_opcodes.h +++ b/core/ir/dr_ir_opcodes.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_OPCODES_H_ -#define _DR_IR_OPCODES_H_ 1 +#define _DR_IR_OPCODES_H_ #ifdef X86 # include "dr_ir_opcodes_x86.h" diff --git a/core/ir/encode_api.h b/core/ir/encode_api.h index 33ebe7b102..c16c6a498c 100644 --- a/core/ir/encode_api.h +++ b/core/ir/encode_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2024 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_ENCODE_H_ -#define _DR_IR_ENCODE_H_ 1 +#define _DR_IR_ENCODE_H_ /************************************************** * ENCODING ROUTINES diff --git a/core/ir/instr.h b/core/ir/instr.h index a3ecc999a9..c193897c34 100644 --- a/core/ir/instr.h +++ b/core/ir/instr.h @@ -42,7 +42,7 @@ /* file "instr.h" -- instr_t specific definitions and utilities */ #ifndef _INSTR_H_ -#define _INSTR_H_ 1 +#define _INSTR_H_ #include "opcode_api.h" #include "opnd.h" diff --git a/core/ir/instr_api.h b/core/ir/instr_api.h index 732ffd8085..1ace173835 100644 --- a/core/ir/instr_api.h +++ b/core/ir/instr_api.h @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_INSTR_H_ -#define _DR_IR_INSTR_H_ 1 +#define _DR_IR_INSTR_H_ /**************************************************************************** * INSTR ROUTINES diff --git a/core/ir/instr_create_shared.h b/core/ir/instr_create_shared.h index 4766c46ef5..ad75d46467 100644 --- a/core/ir/instr_create_shared.h +++ b/core/ir/instr_create_shared.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2021 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -35,7 +35,7 @@ /* Copyright (c) 2002-2003 Massachusetts Institute of Technology */ #ifndef _INSTR_CREATE_SHARED_H_ -#define _INSTR_CREATE_SHARED_H_ 1 +#define _INSTR_CREATE_SHARED_H_ #include "decode.h" #include "instr_create_shared_api.h" diff --git a/core/ir/instr_create_shared_api.h b/core/ir/instr_create_shared_api.h index 573882fdf0..a6a2366966 100644 --- a/core/ir/instr_create_shared_api.h +++ b/core/ir/instr_create_shared_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2024 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -35,7 +35,7 @@ /* Copyright (c) 2002-2003 Massachusetts Institute of Technology */ #ifndef _DR_IR_MACROS_H_ -#define _DR_IR_MACROS_H_ 1 +#define _DR_IR_MACROS_H_ /** * @file dr_ir_macros.h diff --git a/core/ir/instr_inline_api.h b/core/ir/instr_inline_api.h index 31e158bb0d..49ac327f6a 100644 --- a/core/ir/instr_inline_api.h +++ b/core/ir/instr_inline_api.h @@ -31,7 +31,7 @@ */ #ifndef _DR_IR_INSTR_INLINE_H_ -#define _DR_IR_INSTR_INLINE_H_ 1 +#define _DR_IR_INSTR_INLINE_H_ /************************************************** * INSTRUCTION ROUTINE INLINING SUPPORT diff --git a/core/ir/instrlist.h b/core/ir/instrlist.h index 95be78298f..143af28dde 100644 --- a/core/ir/instrlist.h +++ b/core/ir/instrlist.h @@ -38,7 +38,7 @@ /* file "instrlist.h" */ #ifndef _INSTRLIST_H_ -#define _INSTRLIST_H_ 1 +#define _INSTRLIST_H_ #include "instr.h" #include "instrlist_api.h" diff --git a/core/ir/instrlist_api.h b/core/ir/instrlist_api.h index 03e8aaeabf..516c37b759 100644 --- a/core/ir/instrlist_api.h +++ b/core/ir/instrlist_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_INSTRLIST_H_ -#define _DR_IR_INSTRLIST_H_ 1 +#define _DR_IR_INSTRLIST_H_ /**************************************************************************** * INSTRLIST ROUTINES diff --git a/core/ir/ir_utils.h b/core/ir/ir_utils.h index f5663b4136..db421950bb 100644 --- a/core/ir/ir_utils.h +++ b/core/ir/ir_utils.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2020 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -38,7 +38,7 @@ /* ir_utils.h -- IR utility functions */ #ifndef _IR_UTILS_H_ -#define _IR_UTILS_H_ 1 +#define _IR_UTILS_H_ /* Public */ void diff --git a/core/ir/isa_regdeps/decode.h b/core/ir/isa_regdeps/decode.h index d234115b89..6bd6c95aee 100644 --- a/core/ir/isa_regdeps/decode.h +++ b/core/ir/isa_regdeps/decode.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _REGDEPS_DECODE_H_ -#define _REGDEPS_DECODE_H_ 1 +#define _REGDEPS_DECODE_H_ #include "../globals.h" diff --git a/core/ir/isa_regdeps/disassemble.h b/core/ir/isa_regdeps/disassemble.h index 4627710a55..53754e4ad6 100644 --- a/core/ir/isa_regdeps/disassemble.h +++ b/core/ir/isa_regdeps/disassemble.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _REGDEPS_DISASSEMBLE_H_ -#define _REGDEPS_DISASSEMBLE_H_ 1 +#define _REGDEPS_DISASSEMBLE_H_ #include "../globals.h" diff --git a/core/ir/isa_regdeps/encode.h b/core/ir/isa_regdeps/encode.h index b93ce20ab8..ab7a9e2e43 100644 --- a/core/ir/isa_regdeps/encode.h +++ b/core/ir/isa_regdeps/encode.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2024 Google, Inc. All rights reserved. + * Copyright (c) 2024-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _REGDEPS_ENCODE_H_ -#define _REGDEPS_ENCODE_H_ 1 +#define _REGDEPS_ENCODE_H_ #include "../globals.h" diff --git a/core/ir/opnd.h b/core/ir/opnd.h index 596194fd39..c371736446 100644 --- a/core/ir/opnd.h +++ b/core/ir/opnd.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2022 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -38,7 +38,7 @@ /* file "opnd.h" -- opnd_t definitions and utilities */ #ifndef _OPND_H_ -#define _OPND_H_ 1 +#define _OPND_H_ #ifdef WINDOWS /* disabled warning for diff --git a/core/ir/opnd_api.h b/core/ir/opnd_api.h index 3696446393..b4f0835a03 100644 --- a/core/ir/opnd_api.h +++ b/core/ir/opnd_api.h @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_OPND_H_ -#define _DR_IR_OPND_H_ 1 +#define _DR_IR_OPND_H_ /**************************************************************************** * OPERAND ROUTINES diff --git a/core/ir/riscv64/codec.h b/core/ir/riscv64/codec.h index 83b40caf6c..1cff29be0b 100644 --- a/core/ir/riscv64/codec.h +++ b/core/ir/riscv64/codec.h @@ -31,7 +31,7 @@ */ #ifndef CODEC_H -#define CODEC_H 1 +#define CODEC_H #include diff --git a/core/ir/riscv64/decode_private.h b/core/ir/riscv64/decode_private.h index c3da8546a5..e7fc972362 100644 --- a/core/ir/riscv64/decode_private.h +++ b/core/ir/riscv64/decode_private.h @@ -31,7 +31,7 @@ */ #ifndef DECODE_PRIVATE_H -#define DECODE_PRIVATE_H 1 +#define DECODE_PRIVATE_H struct _decode_info_t { bool check_reachable; /* This is used by the encoder, not the decoder. */ diff --git a/core/ir/riscv64/instr_create_api.h.in b/core/ir/riscv64/instr_create_api.h.in index e9b5a336ca..9c7df57138 100644 --- a/core/ir/riscv64/instr_create_api.h.in +++ b/core/ir/riscv64/instr_create_api.h.in @@ -31,7 +31,7 @@ */ #ifndef _DR_IR_MACROS_RISCV64_H_ -#define _DR_IR_MACROS_RISCV64_H_ 1 +#define _DR_IR_MACROS_RISCV64_H_ /**************************************************************************** * Platform-independent INSTR_CREATE_* macros diff --git a/core/ir/riscv64/opcode_api.h.in b/core/ir/riscv64/opcode_api.h.in index 08be582820..c3e73a6112 100644 --- a/core/ir/riscv64/opcode_api.h.in +++ b/core/ir/riscv64/opcode_api.h.in @@ -31,7 +31,7 @@ */ #ifndef _DR_IR_OPCODES_RISCV64_H_ -#define _DR_IR_OPCODES_RISCV64_H_ 1 +#define _DR_IR_OPCODES_RISCV64_H_ /**************************************************************************** * OPCODES diff --git a/core/ir/riscv64/trie.h b/core/ir/riscv64/trie.h index f1c5562f6d..b3d12d2b7d 100644 --- a/core/ir/riscv64/trie.h +++ b/core/ir/riscv64/trie.h @@ -30,7 +30,7 @@ */ #ifndef TRIE_H -#define TRIE_H 1 +#define TRIE_H #include diff --git a/core/ir/x86/instr_create.h b/core/ir/x86/instr_create.h index 21c68b2d6c..b5aeeea367 100644 --- a/core/ir/x86/instr_create.h +++ b/core/ir/x86/instr_create.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2021 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -35,7 +35,7 @@ /* Copyright (c) 2002-2003 Massachusetts Institute of Technology */ #ifndef _INSTR_CREATE_H_ -#define _INSTR_CREATE_H_ 1 +#define _INSTR_CREATE_H_ /* Non-exported instr create macros. */ diff --git a/core/ir/x86/instr_create_api.h b/core/ir/x86/instr_create_api.h index b1b49d86af..1d4d29391c 100644 --- a/core/ir/x86/instr_create_api.h +++ b/core/ir/x86/instr_create_api.h @@ -35,7 +35,7 @@ /* Copyright (c) 2002-2003 Massachusetts Institute of Technology */ #ifndef _DR_IR_MACROS_X86_H_ -#define _DR_IR_MACROS_X86_H_ 1 +#define _DR_IR_MACROS_X86_H_ /** * @file dr_ir_macros_x86.h diff --git a/core/ir/x86/opcode_api.h b/core/ir/x86/opcode_api.h index a49c30a0a7..5cabbb3038 100644 --- a/core/ir/x86/opcode_api.h +++ b/core/ir/x86/opcode_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2024 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -36,7 +36,7 @@ /* Copyright (c) 2000-2001 Hewlett-Packard Company */ #ifndef _DR_IR_OPCODES_X86_H_ -#define _DR_IR_OPCODES_X86_H_ 1 +#define _DR_IR_OPCODES_X86_H_ /**************************************************************************** * OPCODES diff --git a/core/jit_opt.h b/core/jit_opt.h index 542a14758c..961fc8b05e 100644 --- a/core/jit_opt.h +++ b/core/jit_opt.h @@ -1,5 +1,5 @@ #ifndef _JIT_OPT_H_ -#define _JIT_OPT_H_ 1 +#define _JIT_OPT_H_ void jitopt_init(); diff --git a/core/lib/c_defines.h b/core/lib/c_defines.h index 59da18d905..0328d8d33a 100644 --- a/core/lib/c_defines.h +++ b/core/lib/c_defines.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2018 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2003-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -40,7 +40,7 @@ /* clang-format off */ /* (work around clang-format bugs) */ #ifndef _C_DEFINES_H_ -#define _C_DEFINES_H_ 1 +#define _C_DEFINES_H_ #if !defined(__cplusplus) && !defined(NOT_DYNAMORIO_CORE_PROPER) && \ !defined(NOT_DYNAMORIO_CORE) diff --git a/core/lib/dr_annotations.h b/core/lib/dr_annotations.h index 4b73dc8248..e6529831c3 100644 --- a/core/lib/dr_annotations.h +++ b/core/lib/dr_annotations.h @@ -1,5 +1,5 @@ /* ****************************************************** - * Copyright (c) 2014 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * ******************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DYNAMORIO_ANNOTATIONS_H_ -#define _DYNAMORIO_ANNOTATIONS_H_ 1 +#define _DYNAMORIO_ANNOTATIONS_H_ #include "dr_annotations_asm.h" diff --git a/core/lib/dr_annotations_asm.h b/core/lib/dr_annotations_asm.h index 73fcb2533d..248e493228 100644 --- a/core/lib/dr_annotations_asm.h +++ b/core/lib/dr_annotations_asm.h @@ -1,5 +1,5 @@ /* ****************************************************** - * Copyright (c) 2014-2021 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * ******************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DYNAMORIO_ANNOTATIONS_ASM_H_ -#define _DYNAMORIO_ANNOTATIONS_ASM_H_ 1 +#define _DYNAMORIO_ANNOTATIONS_ASM_H_ /* This header defines the annotation functions and code sequences. For a high-level * overview, see https://dynamorio.org/page_annotations.html. diff --git a/core/lib/dr_api.h b/core/lib/dr_api.h index cf0a9724fe..46c569c2f2 100644 --- a/core/lib/dr_api.h +++ b/core/lib/dr_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2014-2024 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_API_H_ -#define _DR_API_H_ 1 +#define _DR_API_H_ /** * @file dr_api.h diff --git a/core/lib/dr_app.h b/core/lib/dr_app.h index f160dbc957..058af34ded 100644 --- a/core/lib/dr_app.h +++ b/core/lib/dr_app.h @@ -38,7 +38,7 @@ */ #ifndef _DR_APP_H_ -#define _DR_APP_H_ 1 +#define _DR_APP_H_ #ifdef WINDOWS # ifdef DR_APP_EXPORTS diff --git a/core/lib/dr_config.h b/core/lib/dr_config.h index 5e236b6469..c3e4b13b24 100644 --- a/core/lib/dr_config.h +++ b/core/lib/dr_config.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2022 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_CONFIG_H_ -#define _DR_CONFIG_H_ 1 +#define _DR_CONFIG_H_ /**************************************************************************** * Deployment API diff --git a/core/lib/dr_events.h b/core/lib/dr_events.h index 3a9038d69e..ea5ce1facc 100644 --- a/core/lib/dr_events.h +++ b/core/lib/dr_events.h @@ -36,7 +36,7 @@ /* Copyright (c) 2002 Hewlett-Packard Company */ #ifndef _DR_EVENTS_H_ -#define _DR_EVENTS_H_ 1 +#define _DR_EVENTS_H_ #include "dr_config.h" diff --git a/core/lib/dr_inject.h b/core/lib/dr_inject.h index 15304acc7b..6d67777337 100644 --- a/core/lib/dr_inject.h +++ b/core/lib/dr_inject.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013-2021 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * Copyright (c) 2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_INJECT_H_ -#define _DR_INJECT_H_ 1 +#define _DR_INJECT_H_ /**************************************************************************** * Injection API diff --git a/core/lib/dr_ir_utils.h b/core/lib/dr_ir_utils.h index 26e43bf2f9..07497725b6 100644 --- a/core/lib/dr_ir_utils.h +++ b/core/lib/dr_ir_utils.h @@ -32,7 +32,7 @@ */ #ifndef _DR_IR_UTILS_H_ -#define _DR_IR_UTILS_H_ 1 +#define _DR_IR_UTILS_H_ /************************************************** * CODE TRANSFORMATION UTILITIES diff --git a/core/lib/dr_stats.h b/core/lib/dr_stats.h index ff9aa936bb..575cb97f31 100644 --- a/core/lib/dr_stats.h +++ b/core/lib/dr_stats.h @@ -34,7 +34,7 @@ /* dr_stats.h: DR's shared memory interface */ #ifndef _DR_STATS_H_ -#define _DR_STATS_H_ 1 +#define _DR_STATS_H_ #include "globals_shared.h" diff --git a/core/lib/dr_tools.h b/core/lib/dr_tools.h index 89814d5be3..fa570481d4 100644 --- a/core/lib/dr_tools.h +++ b/core/lib/dr_tools.h @@ -32,7 +32,7 @@ */ #ifndef _DR_TOOLS_H_ -#define _DR_TOOLS_H_ 1 +#define _DR_TOOLS_H_ /************************************************** * TOP-LEVEL ROUTINES diff --git a/core/lib/globals_api.h b/core/lib/globals_api.h index 8a2fc5ed9b..799cce2b4d 100644 --- a/core/lib/globals_api.h +++ b/core/lib/globals_api.h @@ -36,7 +36,7 @@ /* Copyright (c) 2002 Hewlett-Packard Company */ #ifndef _DR_DEFINES_H_ -#define _DR_DEFINES_H_ 1 +#define _DR_DEFINES_H_ /**************************************************************************** * GENERAL TYPEDEFS AND DEFINES diff --git a/core/lib/globals_shared.h b/core/lib/globals_shared.h index 780b5286b0..dc04da727e 100644 --- a/core/lib/globals_shared.h +++ b/core/lib/globals_shared.h @@ -41,7 +41,7 @@ */ #ifndef _GLOBALS_SHARED_H_ -#define _GLOBALS_SHARED_H_ 1 +#define _GLOBALS_SHARED_H_ /* if not Unix, we assume Windows */ #ifndef UNIX diff --git a/core/lib/hotpatch_interface.h b/core/lib/hotpatch_interface.h index 02fd737103..f64d81e3d4 100644 --- a/core/lib/hotpatch_interface.h +++ b/core/lib/hotpatch_interface.h @@ -33,7 +33,7 @@ /* Copyright (c) 2005-2007 Determina Corp. */ #ifndef _HOTPATCH_INTERFACE_H_ -#define _HOTPATCH_INTERFACE_H_ 1 +#define _HOTPATCH_INTERFACE_H_ /* This file defines the interface between the core and the hot patches. Any * changes to this file will most likely require changes to both. diff --git a/core/lib/instrument.h b/core/lib/instrument.h index 87972ab9f3..c5bd4989f5 100644 --- a/core/lib/instrument.h +++ b/core/lib/instrument.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2022 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2002-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -40,7 +40,7 @@ */ #ifndef _INSTRUMENT_H_ -#define _INSTRUMENT_H_ 1 +#define _INSTRUMENT_H_ #include "../globals.h" #include "../module_shared.h" diff --git a/core/lib/probe_api.h b/core/lib/probe_api.h index 2d71a88260..e866e1644e 100644 --- a/core/lib/probe_api.h +++ b/core/lib/probe_api.h @@ -32,7 +32,7 @@ */ #ifndef _DR_PROBE_H_ -#define _DR_PROBE_H_ 1 +#define _DR_PROBE_H_ /**************************************************************************** * Probe API diff --git a/core/link.h b/core/link.h index 7505aaa40f..a359c668c5 100644 --- a/core/link.h +++ b/core/link.h @@ -40,7 +40,7 @@ */ #ifndef _CORE_LINK_H_ /* using different define than /usr/include/link.h */ -#define _CORE_LINK_H_ 1 +#define _CORE_LINK_H_ /* linkstub_t flags * WARNING: flags field is a ushort, so max flag is 0x8000! diff --git a/core/module_api.h b/core/module_api.h index 15d16211b8..2c29886278 100644 --- a/core/module_api.h +++ b/core/module_api.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2021 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -32,7 +32,7 @@ */ #ifndef _DR_MODULES_H_ -#define _DR_MODULES_H_ 1 +#define _DR_MODULES_H_ /** * @file dr_modules.h diff --git a/core/monitor.h b/core/monitor.h index 9705cd9177..66935d9649 100644 --- a/core/monitor.h +++ b/core/monitor.h @@ -39,7 +39,7 @@ */ #ifndef _MONITOR_H_ -#define _MONITOR_H_ 1 +#define _MONITOR_H_ #include "fragment.h" /* for trace_bb_info_t, and for custom traces * the "fragment_t wrapper" struct */ diff --git a/core/native_exec.h b/core/native_exec.h index f7c4a9aec2..902f32c59b 100644 --- a/core/native_exec.h +++ b/core/native_exec.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2017 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _NATIVE_EXEC_H_ -#define _NATIVE_EXEC_H_ 1 +#define _NATIVE_EXEC_H_ #include "globals.h" #include "module_shared.h" diff --git a/core/os_api.h b/core/os_api.h index 9483e7731e..ec349274ce 100644 --- a/core/os_api.h +++ b/core/os_api.h @@ -32,7 +32,7 @@ */ #ifndef _DR_OS_UTILS_H_ -#define _DR_OS_UTILS_H_ 1 +#define _DR_OS_UTILS_H_ /** * @file dr_os_utils.h diff --git a/core/perscache.h b/core/perscache.h index 9d279b8ecd..f8c75090ce 100644 --- a/core/perscache.h +++ b/core/perscache.h @@ -38,7 +38,7 @@ */ #ifndef _PERSCACHE_H_ -#define _PERSCACHE_H_ 1 +#define _PERSCACHE_H_ #include "module_shared.h" /* for module_digest_t */ diff --git a/core/translate.h b/core/translate.h index 3aa24fe124..7c88623f83 100644 --- a/core/translate.h +++ b/core/translate.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2023 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -39,7 +39,7 @@ */ #ifndef _TRANSLATE_H_ -#define _TRANSLATE_H_ 1 +#define _TRANSLATE_H_ enum { /* Each translation entry represents a sequence of instructions. diff --git a/core/unix/include/android_linker.h b/core/unix/include/android_linker.h index 21e65fabdf..72a444860a 100644 --- a/core/unix/include/android_linker.h +++ b/core/unix/include/android_linker.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _ANDROID_LINKER_H_ -#define _ANDROID_LINKER_H_ 1 +#define _ANDROID_LINKER_H_ #include #include "module_private.h" diff --git a/core/unix/include/syscall.h b/core/unix/include/syscall.h index d37c56363f..505cfead72 100644 --- a/core/unix/include/syscall.h +++ b/core/unix/include/syscall.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _SYSCALL_H_ -#define _SYSCALL_H_ 1 +#define _SYSCALL_H_ /* Do not include this on MacOS as you'll get the wrong numbers! */ #ifndef LINUX diff --git a/core/unix/include/syscall_linux_arm.h b/core/unix/include/syscall_linux_arm.h index b0143ade19..492da7e31e 100644 --- a/core/unix/include/syscall_linux_arm.h +++ b/core/unix/include/syscall_linux_arm.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _SYSCALL_LINUX_ARM_H_ -#define _SYSCALL_LINUX_ARM_H_ 1 +#define _SYSCALL_LINUX_ARM_H_ /* Do not include this on MacOS as you'll get the wrong numbers! */ #ifndef LINUX diff --git a/core/unix/include/syscall_linux_riscv64.h b/core/unix/include/syscall_linux_riscv64.h index fc9e9397a0..7e0d228348 100644 --- a/core/unix/include/syscall_linux_riscv64.h +++ b/core/unix/include/syscall_linux_riscv64.h @@ -5,7 +5,7 @@ */ #ifndef SYSCALL_LINUX_RISCV64_H -#define SYSCALL_LINUX_RISCV64_H 1 +#define SYSCALL_LINUX_RISCV64_H #ifndef LINUX # error Only use this file on Linux diff --git a/core/unix/include/syscall_linux_uapi.h b/core/unix/include/syscall_linux_uapi.h index 8562925ec2..990948d7ae 100644 --- a/core/unix/include/syscall_linux_uapi.h +++ b/core/unix/include/syscall_linux_uapi.h @@ -5,7 +5,7 @@ */ #ifndef SYSCALL_LINUX_UAPI_H -#define SYSCALL_LINUX_UAPI_H 1 +#define SYSCALL_LINUX_UAPI_H #ifndef LINUX # error Only use this file on Linux diff --git a/core/unix/include/syscall_linux_x86.h b/core/unix/include/syscall_linux_x86.h index fba9708975..7afe0ad321 100644 --- a/core/unix/include/syscall_linux_x86.h +++ b/core/unix/include/syscall_linux_x86.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _SYSCALL_LINUX_X86_H_ -#define _SYSCALL_LINUX_X86_H_ 1 +#define _SYSCALL_LINUX_X86_H_ /* Do not include this on MacOS as you'll get the wrong numbers! */ #ifndef LINUX diff --git a/core/unix/include/syscall_mach.h b/core/unix/include/syscall_mach.h index 0f84b1036e..590ab1055b 100644 --- a/core/unix/include/syscall_mach.h +++ b/core/unix/include/syscall_mach.h @@ -1,5 +1,5 @@ /* ******************************************************************************* - * Copyright (c) 2014 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * *******************************************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _SYSCALL_MACH_H_ -#define _SYSCALL_MACH_H_ 1 +#define _SYSCALL_MACH_H_ #define SYSCALL_NUM_MARKER_MACH 0x1000000 #define SYSCALL_NUM_MARKER_BSD 0x2000000 diff --git a/core/unix/include/syscall_target.h b/core/unix/include/syscall_target.h index ce9e756425..d8869dde84 100644 --- a/core/unix/include/syscall_target.h +++ b/core/unix/include/syscall_target.h @@ -1,5 +1,5 @@ #ifndef _SYSCALL_TARGET_H_ -#define _SYSCALL_TARGET_H_ 1 +#define _SYSCALL_TARGET_H_ /* Do not include this on MacOS as you'll get the wrong numbers! */ #ifndef LINUX diff --git a/core/unix/ksynch.h b/core/unix/ksynch.h index ad0ccfba45..ff4dc78aeb 100644 --- a/core/unix/ksynch.h +++ b/core/unix/ksynch.h @@ -1,5 +1,5 @@ /* ******************************************************************************* - * Copyright (c) 2013-2017 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * *******************************************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _KSYNCH_H_ -#define _KSYNCH_H_ 1 +#define _KSYNCH_H_ /* These are simply kernel wait queue variables, suitable for use in * signal handlers where we can't use event_t. They take the values 0 diff --git a/core/unix/memcache.h b/core/unix/memcache.h index 74f6619faa..1bcb832ed5 100644 --- a/core/unix/memcache.h +++ b/core/unix/memcache.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013-2018 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _MEMCACHE_H_ -#define _MEMCACHE_H_ 1 +#define _MEMCACHE_H_ void memcache_init(void); diff --git a/core/unix/memquery.h b/core/unix/memquery.h index 7bba817447..21c1fad6d7 100644 --- a/core/unix/memquery.h +++ b/core/unix/memquery.h @@ -1,5 +1,5 @@ /* ******************************************************************************* - * Copyright (c) 2013-2017 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * *******************************************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _MEMQUERY_H_ -#define _MEMQUERY_H_ 1 +#define _MEMQUERY_H_ typedef struct _memquery_iter_t { /* --- EXTERNAL OUT PARAMS --- */ diff --git a/core/unix/memquery_macos.h b/core/unix/memquery_macos.h index 9412271ce4..99fba2ce70 100644 --- a/core/unix/memquery_macos.h +++ b/core/unix/memquery_macos.h @@ -1,5 +1,5 @@ /* ******************************************************************************* - * Copyright (c) 2014 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * *******************************************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _MEMQUERY_MACOS_H_ -#define _MEMQUERY_MACOS_H_ 1 +#define _MEMQUERY_MACOS_H_ /* Translate mach flags to memprot flags. They happen to equal the mmap * flags, but best to not rely on that. diff --git a/core/unix/module_macos_dyld.h b/core/unix/module_macos_dyld.h index 9e70294412..d60bd155d7 100644 --- a/core/unix/module_macos_dyld.h +++ b/core/unix/module_macos_dyld.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _MODULE_MACOS_DYLD_H_ -#define _MODULE_MACOS_DYLD_H_ 1 +#define _MODULE_MACOS_DYLD_H_ struct dyld_cache_header { char magic[16]; diff --git a/core/unix/os_asm_defines.asm b/core/unix/os_asm_defines.asm index 9ccd737d16..f1d0b5bfe3 100644 --- a/core/unix/os_asm_defines.asm +++ b/core/unix/os_asm_defines.asm @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2016 Google, Inc. All rights reserved. + * Copyright (c) 2016-2025 Google, Inc. All rights reserved. * ********************************************************** */ /* @@ -35,7 +35,7 @@ */ #ifndef _OS_ASM_DEFINES_ASM_ -#define _OS_ASM_DEFINES_ASM_ 1 +#define _OS_ASM_DEFINES_ASM_ /* XXX: keep in sync with TLS_MAGIC_OFFSET, etc. in os.c. * We have checks in os_tls_init() and privload_mod_tls_init(). diff --git a/core/unix/os_exports.h b/core/unix/os_exports.h index 824773bbe7..a745bfc7af 100644 --- a/core/unix/os_exports.h +++ b/core/unix/os_exports.h @@ -40,7 +40,7 @@ */ #ifndef _OS_EXPORTS_H_ -#define _OS_EXPORTS_H_ 1 +#define _OS_EXPORTS_H_ #include #include "../os_shared.h" // IWYU pragma: export diff --git a/core/unix/os_private.h b/core/unix/os_private.h index 56a6431ada..8a0a9fe638 100644 --- a/core/unix/os_private.h +++ b/core/unix/os_private.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2024 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2008-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -37,7 +37,7 @@ */ #ifndef _OS_PRIVATE_H_ -#define _OS_PRIVATE_H_ 1 +#define _OS_PRIVATE_H_ #include /* for stack_t */ #include "include/siginfo.h" diff --git a/core/unix/os_public.h b/core/unix/os_public.h index f19036ad65..f538d1dc44 100644 --- a/core/unix/os_public.h +++ b/core/unix/os_public.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2022 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2000-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -40,7 +40,7 @@ */ #ifndef _OS_PUBLIC_H_ -#define _OS_PUBLIC_H_ 1 +#define _OS_PUBLIC_H_ #ifdef LINUX # include "include/sigcontext.h" diff --git a/core/unix/rseq_linux.h b/core/unix/rseq_linux.h index 7b2af47ee8..1b0f414321 100644 --- a/core/unix/rseq_linux.h +++ b/core/unix/rseq_linux.h @@ -1,5 +1,5 @@ /* ******************************************************************************* - * Copyright (c) 2019-2023 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * *******************************************************************************/ /* @@ -35,7 +35,7 @@ */ #ifndef _RSEQ_H_ -#define _RSEQ_H_ 1 +#define _RSEQ_H_ #include "../globals.h" #include "../module_shared.h" diff --git a/core/unix/signal_private.h b/core/unix/signal_private.h index 61d162c984..a61c841a94 100644 --- a/core/unix/signal_private.h +++ b/core/unix/signal_private.h @@ -37,7 +37,7 @@ */ #ifndef _SIGNAL_PRIVATE_H_ -#define _SIGNAL_PRIVATE_H_ 1 +#define _SIGNAL_PRIVATE_H_ /* We have an ordering issue so we split out LINUX from globals.h */ #include "configure.h" diff --git a/core/unix/symtab.h b/core/unix/symtab.h index 84ea6f642a..1502fa5919 100644 --- a/core/unix/symtab.h +++ b/core/unix/symtab.h @@ -40,7 +40,7 @@ */ #ifndef _SYMTAB_H_ -#define _SYMTAB_H_ 1 +#define _SYMTAB_H_ /* initialization */ bool diff --git a/core/unix/tls.h b/core/unix/tls.h index 51b4016ec2..67e2ad074e 100644 --- a/core/unix/tls.h +++ b/core/unix/tls.h @@ -42,7 +42,7 @@ */ #ifndef _OS_TLS_H_ -#define _OS_TLS_H_ 1 +#define _OS_TLS_H_ #include "os_private.h" /* ASM_XAX */ #if defined(ARM) && defined(LINUX) diff --git a/core/utils.h b/core/utils.h index f65f955e48..a07067e3f3 100644 --- a/core/utils.h +++ b/core/utils.h @@ -40,7 +40,7 @@ */ #ifndef _UTILS_H_ -#define _UTILS_H_ 1 +#define _UTILS_H_ #ifdef assert # undef assert diff --git a/core/vmareas.h b/core/vmareas.h index 43cdaf1e0a..a8fbebb284 100644 --- a/core/vmareas.h +++ b/core/vmareas.h @@ -39,7 +39,7 @@ */ #ifndef _VMAREAS_H_ -#define _VMAREAS_H_ 1 +#define _VMAREAS_H_ /* case 9750: use these constants to specify empty and all-encompassing address * space regions for flushing, etc. diff --git a/core/win32/diagnost.h b/core/win32/diagnost.h index db461ba393..70b55ad1ff 100644 --- a/core/win32/diagnost.h +++ b/core/win32/diagnost.h @@ -38,7 +38,7 @@ */ #ifndef _DIAGNOST_H_ -#define _DIAGNOST_H_ 1 +#define _DIAGNOST_H_ /* XXX: The key for the log directory should be in a shared file! */ #define DIAGNOSTICS_LOGDIR_KEY L"DYNAMORIO_LOGDIR" diff --git a/core/win32/drwinapi/advapi32_redir.h b/core/win32/drwinapi/advapi32_redir.h index dcc323a099..472c3600d2 100644 --- a/core/win32/drwinapi/advapi32_redir.h +++ b/core/win32/drwinapi/advapi32_redir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _ADVAPI32_REDIR_H_ -#define _ADVAPI32_REDIR_H_ 1 +#define _ADVAPI32_REDIR_H_ #include "../../globals.h" #include "../../module_shared.h" diff --git a/core/win32/drwinapi/drwinapi.h b/core/win32/drwinapi/drwinapi.h index e046a09e5c..43f458a80c 100644 --- a/core/win32/drwinapi/drwinapi.h +++ b/core/win32/drwinapi/drwinapi.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013-2014 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _DRWINAPI_H_ -#define _DRWINAPI_H_ 1 +#define _DRWINAPI_H_ #include "../../module_shared.h" diff --git a/core/win32/drwinapi/drwinapi_private.h b/core/win32/drwinapi/drwinapi_private.h index caabbf9533..468b6129d9 100644 --- a/core/win32/drwinapi/drwinapi_private.h +++ b/core/win32/drwinapi/drwinapi_private.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* Data and code shared among all DynamoRIO Windows API redirection routines */ #ifndef _DRWINAPI_PRIVATE_H_ -#define _DRWINAPI_PRIVATE_H_ 1 +#define _DRWINAPI_PRIVATE_H_ /* Redirection of system library routines. * This includes some ntdll routines that for transparency reasons we can't diff --git a/core/win32/drwinapi/kernel32_redir.h b/core/win32/drwinapi/kernel32_redir.h index 3a3a367247..bebb2dae08 100644 --- a/core/win32/drwinapi/kernel32_redir.h +++ b/core/win32/drwinapi/kernel32_redir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2014 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2009-2010 Derek Bruening All rights reserved. * **********************************************************/ @@ -37,7 +37,7 @@ */ #ifndef _KERNEL32_REDIR_H_ -#define _KERNEL32_REDIR_H_ 1 +#define _KERNEL32_REDIR_H_ #ifdef _WIN32_WINNT # error Must include kernel32_redir.h before globals.h diff --git a/core/win32/drwinapi/ntdll_redir.h b/core/win32/drwinapi/ntdll_redir.h index 94a6029833..74d2b0f84e 100644 --- a/core/win32/drwinapi/ntdll_redir.h +++ b/core/win32/drwinapi/ntdll_redir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2014 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2009-2010 Derek Bruening All rights reserved. * **********************************************************/ @@ -34,7 +34,7 @@ /* ntdll.dll redirection for custom private library loader */ #ifndef _NTDLL_REDIR_H_ -#define _NTDLL_REDIR_H_ 1 +#define _NTDLL_REDIR_H_ #include "../../globals.h" diff --git a/core/win32/drwinapi/rpcrt4_redir.h b/core/win32/drwinapi/rpcrt4_redir.h index 473ab9efcd..d169fdea71 100644 --- a/core/win32/drwinapi/rpcrt4_redir.h +++ b/core/win32/drwinapi/rpcrt4_redir.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2013 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2009-2010 Derek Bruening All rights reserved. * **********************************************************/ @@ -37,7 +37,7 @@ */ #ifndef _RPCRT4_REDIR_H_ -#define _RPCRT4_REDIR_H_ 1 +#define _RPCRT4_REDIR_H_ #include "../../globals.h" #include "../../module_shared.h" diff --git a/core/win32/ntdll.h b/core/win32/ntdll.h index d899b08dc2..9045844699 100644 --- a/core/win32/ntdll.h +++ b/core/win32/ntdll.h @@ -45,7 +45,7 @@ */ #ifndef _NTDLL_H_ -#define _NTDLL_H_ 1 +#define _NTDLL_H_ #define WIN32_LEAN_AND_MEAN #include diff --git a/core/win32/ntdll_shared.h b/core/win32/ntdll_shared.h index 0bf3f99bd6..788cb6dfc9 100644 --- a/core/win32/ntdll_shared.h +++ b/core/win32/ntdll_shared.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2021 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2003-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -40,7 +40,7 @@ */ #ifndef _NTDLL_SHARED_H_ -#define _NTDLL_SHARED_H_ 1 +#define _NTDLL_SHARED_H_ #define WIN32_LEAN_AND_MEAN #include diff --git a/core/win32/ntdll_types.h b/core/win32/ntdll_types.h index d2b6f2ad1e..301a691a0a 100644 --- a/core/win32/ntdll_types.h +++ b/core/win32/ntdll_types.h @@ -14,7 +14,7 @@ /* ntdll types shared with ntdll_imports.c */ #ifndef _NTDLL_TYPES_H_ -#define _NTDLL_TYPES_H_ 1 +#define _NTDLL_TYPES_H_ /*************************************************************************** * structs and defines diff --git a/core/win32/os_exports.h b/core/win32/os_exports.h index 22918ec941..ab8289cfc3 100644 --- a/core/win32/os_exports.h +++ b/core/win32/os_exports.h @@ -40,7 +40,7 @@ */ #ifndef _OS_EXPORTS_H_ -#define _OS_EXPORTS_H_ 1 +#define _OS_EXPORTS_H_ #include "os_public.h" // IWYU pragma: export #include "../os_shared.h" // IWYU pragma: export diff --git a/core/win32/os_private.h b/core/win32/os_private.h index 819e4a42c9..76b72a1e38 100644 --- a/core/win32/os_private.h +++ b/core/win32/os_private.h @@ -39,7 +39,7 @@ */ #ifndef _OS_PRIVATE_H_ -#define _OS_PRIVATE_H_ 1 +#define _OS_PRIVATE_H_ #include "drmarker.h" diff --git a/core/win32/os_public.h b/core/win32/os_public.h index 01aafc2788..aef8255d99 100644 --- a/core/win32/os_public.h +++ b/core/win32/os_public.h @@ -40,7 +40,7 @@ */ #ifndef _OS_PUBLIC_H_ -#define _OS_PUBLIC_H_ 1 +#define _OS_PUBLIC_H_ /* CONTEXT field name changes: before including arch_exports.h, for cxt_seg_t! */ #ifdef X64 diff --git a/ext/drbbdup/drbbdup.h b/ext/drbbdup/drbbdup.h index 0095de74e0..3adff3f509 100644 --- a/ext/drbbdup/drbbdup.h +++ b/ext/drbbdup/drbbdup.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020-2023 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DRBBDUP_H_ -#define _DRBBDUP_H_ 1 +#define _DRBBDUP_H_ #include "drmgr.h" #include diff --git a/ext/drcallstack/drcallstack.h b/ext/drcallstack/drcallstack.h index 143cd89f12..47292d901b 100644 --- a/ext/drcallstack/drcallstack.h +++ b/ext/drcallstack/drcallstack.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2021 Google, Inc. All rights reserved. + * Copyright (c) 2021-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* DynamoRIO Callstack Walker. */ #ifndef _DRCALLSTACK_H_ -#define _DRCALLSTACK_H_ 1 +#define _DRCALLSTACK_H_ /** * @file drcallstack.h diff --git a/ext/drcontainers/drtable.h b/ext/drcontainers/drtable.h index 37c3e3166d..ae05a85c51 100644 --- a/ext/drcontainers/drtable.h +++ b/ext/drcontainers/drtable.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2013 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* Containers DynamoRIO Extension: DrTable */ #ifndef _DRTABLE_H_ -#define _DRTABLE_H_ 1 +#define _DRTABLE_H_ /** * @file drtable.h diff --git a/ext/drcontainers/drvector.h b/ext/drcontainers/drvector.h index f3d6352863..010d050952 100644 --- a/ext/drcontainers/drvector.h +++ b/ext/drcontainers/drvector.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2013 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* Containers DynamoRIO Extension: DrVector */ #ifndef _DRVECTOR_H_ -#define _DRVECTOR_H_ 1 +#define _DRVECTOR_H_ /** * @file drvector.h diff --git a/ext/drcontainers/hashtable.h b/ext/drcontainers/hashtable.h index 92502ce197..c2325aedc2 100644 --- a/ext/drcontainers/hashtable.h +++ b/ext/drcontainers/hashtable.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2022 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2007-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -34,7 +34,7 @@ /* Containers DynamoRIO Extension: Hashtable */ #ifndef _HASHTABLE_H_ -#define _HASHTABLE_H_ 1 +#define _HASHTABLE_H_ /** * @file hashtable.h diff --git a/ext/drcovlib/drcovlib.h b/ext/drcovlib/drcovlib.h index f01b9290ac..3a05bae105 100644 --- a/ext/drcovlib/drcovlib.h +++ b/ext/drcovlib/drcovlib.h @@ -33,7 +33,7 @@ /* DynamoRIO Code Coverage Library */ #ifndef _DRCOVLIB_H_ -#define _DRCOVLIB_H_ 1 +#define _DRCOVLIB_H_ /** * @file drcovlib.h diff --git a/ext/drext.h b/ext/drext.h index 6bb1d9b02c..e8aa15ad85 100644 --- a/ext/drext.h +++ b/ext/drext.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DREXT_H_ -#define _DREXT_H_ 1 +#define _DREXT_H_ /** * @file drext.h diff --git a/ext/drmf/common/asm_utils.h b/ext/drmf/common/asm_utils.h index dbc3d6ef59..4d6f8f4179 100644 --- a/ext/drmf/common/asm_utils.h +++ b/ext/drmf/common/asm_utils.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2024 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * Copyright (c) 2007-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -21,7 +21,7 @@ */ #ifndef _ASM_UTILS_H_ -#define _ASM_UTILS_H_ 1 +#define _ASM_UTILS_H_ /* Returns the current values of xsp and xbp */ void diff --git a/ext/drmf/common/utils.h b/ext/drmf/common/utils.h index aeb9e35627..2e26e2b3c5 100644 --- a/ext/drmf/common/utils.h +++ b/ext/drmf/common/utils.h @@ -21,7 +21,7 @@ */ #ifndef _UTILS_H_ -#define _UTILS_H_ 1 +#define _UTILS_H_ #ifdef __cplusplus extern "C" { diff --git a/ext/drmf/common/windefs.h b/ext/drmf/common/windefs.h index d4fb4f4eab..a51887f88e 100644 --- a/ext/drmf/common/windefs.h +++ b/ext/drmf/common/windefs.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _WINDEFS_H_ -#define _WINDEFS_H_ 1 +#define _WINDEFS_H_ #define WIN32_LEAN_AND_MEAN #include diff --git a/ext/drmf/framework/drmf.h b/ext/drmf/framework/drmf.h index ec62f8fa51..d936e66223 100644 --- a/ext/drmf/framework/drmf.h +++ b/ext/drmf/framework/drmf.h @@ -20,7 +20,7 @@ */ #ifndef _DRMF_H_ -#define _DRMF_H_ 1 +#define _DRMF_H_ /* Dr. Memory Framework: code shared across Extensions */ diff --git a/ext/drmf/framework/public.h b/ext/drmf/framework/public.h index 7bd17087f0..4991de16a9 100644 --- a/ext/drmf/framework/public.h +++ b/ext/drmf/framework/public.h @@ -20,7 +20,7 @@ */ #ifndef _DRMEMORY_FRAMEWORK_H_ -#define _DRMEMORY_FRAMEWORK_H_ 1 +#define _DRMEMORY_FRAMEWORK_H_ /* Dr. Memory Framework shared header */ diff --git a/ext/drmf/wininc/crtdbg.h b/ext/drmf/wininc/crtdbg.h index f35627382e..0453b29f18 100644 --- a/ext/drmf/wininc/crtdbg.h +++ b/ext/drmf/wininc/crtdbg.h @@ -3,7 +3,7 @@ ****************************************************************************/ #ifndef _CRTDBG_H_ -#define _CRTDBG_H_ 1 +#define _CRTDBG_H_ /*************************************************************************** * from crt/src/crtdbg.h diff --git a/ext/drmf/wininc/ktmtypes.h b/ext/drmf/wininc/ktmtypes.h index a4c484b891..fa115aaedd 100755 --- a/ext/drmf/wininc/ktmtypes.h +++ b/ext/drmf/wininc/ktmtypes.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _KTMTYPES_ -#define _KTMTYPES_ 1 +#define _KTMTYPES_ /* Data types added since VS2005, typically in SDK6.0a. * We assume that cl 14.00 is not being used in conjunction with SDK6.0a diff --git a/ext/drmf/wininc/ntexapi.h b/ext/drmf/wininc/ntexapi.h index 15d98f6fc7..e5b3643735 100644 --- a/ext/drmf/wininc/ntexapi.h +++ b/ext/drmf/wininc/ntexapi.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _NTEXAPI_H_ -#define _NTEXAPI_H_ 1 +#define _NTEXAPI_H_ #include "ndk_iotypes.h" diff --git a/ext/drmf/wininc/ntuser_ex.h b/ext/drmf/wininc/ntuser_ex.h index 3d1ecf60d5..2a84eeadf1 100644 --- a/ext/drmf/wininc/ntuser_ex.h +++ b/ext/drmf/wininc/ntuser_ex.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _NTUSER_EX_ -#define _NTUSER_EX_ 1 +#define _NTUSER_EX_ /* The data structure used for NtUserBuildPropList. * ReactOS has this as PROPLISTITEM but that does not match true Windows. diff --git a/ext/drmf/wininc/ntuser_win8.h b/ext/drmf/wininc/ntuser_win8.h index dc70aff14d..e01a839cc3 100644 --- a/ext/drmf/wininc/ntuser_win8.h +++ b/ext/drmf/wininc/ntuser_win8.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _NTUSER_WIN8_ -#define _NTUSER_WIN8_ 1 +#define _NTUSER_WIN8_ /* Observed called from IMM32!IsLegacyIMEDisabled. Both fields are written * with 0 in all observed instances. diff --git a/ext/drmf/wininc/tls.h b/ext/drmf/wininc/tls.h index 05d8d85031..44c18c79f3 100644 --- a/ext/drmf/wininc/tls.h +++ b/ext/drmf/wininc/tls.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _WINDOWS_TLS_ -#define _WINDOWS_TLS_ 1 +#define _WINDOWS_TLS_ typedef struct _THREAD_TLS_INFORMATION { ULONG Flags; diff --git a/ext/drmf/wininc/winnt_recent.h b/ext/drmf/wininc/winnt_recent.h index 40be936671..906d8cbe7c 100644 --- a/ext/drmf/wininc/winnt_recent.h +++ b/ext/drmf/wininc/winnt_recent.h @@ -10,7 +10,7 @@ ****************************************************************************/ #ifndef _WINNT_RECENT_ -#define _WINNT_RECENT_ 1 +#define _WINNT_RECENT_ /* Data types added since VS2005, typically in SDK6.0a. * We assume that cl 14.00 is not being used in conjunction with SDK6.0a diff --git a/ext/drmf/wininc/wsock.h b/ext/drmf/wininc/wsock.h index 6a4b378aa8..8858411ce3 100644 --- a/ext/drmf/wininc/wsock.h +++ b/ext/drmf/wininc/wsock.h @@ -11,7 +11,7 @@ ****************************************************************************/ #ifndef _WSOCK_H_ -#define _WSOCK_H_ 1 +#define _WSOCK_H_ /*************************************************************************** * from DDK/WDK winsock2.h diff --git a/ext/drmgr/drmgr.h b/ext/drmgr/drmgr.h index 88a85d291a..aee0303cdd 100644 --- a/ext/drmgr/drmgr.h +++ b/ext/drmgr/drmgr.h @@ -35,7 +35,7 @@ */ #ifndef _DRMGR_H_ -#define _DRMGR_H_ 1 +#define _DRMGR_H_ /** * @file drmgr.h diff --git a/ext/drmgr/drmgr_priv.h b/ext/drmgr/drmgr_priv.h index bef921ad7b..43e16b9946 100644 --- a/ext/drmgr/drmgr_priv.h +++ b/ext/drmgr/drmgr_priv.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2020 Google, Inc. All rights reserved. + * Copyright (c) 2020-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DRMGR_PRIV_H_ -#define _DRMGR_PRIV_H_ 1 +#define _DRMGR_PRIV_H_ /* An internal interface that acts as a beachhead for other extensions, e.g. drbbdup, * to integrate their functionalities with drmgr. The interface should only be used diff --git a/ext/droption/droption.h b/ext/droption/droption.h index 43099035a1..2f697fd010 100644 --- a/ext/droption/droption.h +++ b/ext/droption/droption.h @@ -36,7 +36,7 @@ */ #ifndef _DROPTION_H_ -#define _DROPTION_H_ 1 +#define _DROPTION_H_ #include #include diff --git a/ext/drpttracer/drpttracer.h b/ext/drpttracer/drpttracer.h index b8bab90e04..1ee34ca64d 100644 --- a/ext/drpttracer/drpttracer.h +++ b/ext/drpttracer/drpttracer.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _DRPTTRACER_H_ -#define _DRPTTRACER_H_ 1 +#define _DRPTTRACER_H_ /** * @file drpttracer.h diff --git a/ext/drpttracer/drpttracer_shared.h b/ext/drpttracer/drpttracer_shared.h index 7d7e7363d1..cc750d33f8 100644 --- a/ext/drpttracer/drpttracer_shared.h +++ b/ext/drpttracer/drpttracer_shared.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2023 Google, Inc. All rights reserved. + * Copyright (c) 2023-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -33,7 +33,7 @@ /* DynamoRIO Intel PT Tracing Extension. */ #ifndef _DRPTTRACER_SHARED_H_ -#define _DRPTTRACER_SHARED_H_ 1 +#define _DRPTTRACER_SHARED_H_ /** * @file drpttracer_shared.h diff --git a/ext/drreg/drreg.h b/ext/drreg/drreg.h index 2c5e6fc450..71cd63fec7 100644 --- a/ext/drreg/drreg.h +++ b/ext/drreg/drreg.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013-2021 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -36,7 +36,7 @@ */ #ifndef _DRREG_H_ -#define _DRREG_H_ 1 +#define _DRREG_H_ #include "drmgr.h" #include "drvector.h" diff --git a/ext/drsyms/dbghelp_imports.h b/ext/drsyms/dbghelp_imports.h index 4fc827d6b6..9e42ae4a32 100644 --- a/ext/drsyms/dbghelp_imports.h +++ b/ext/drsyms/dbghelp_imports.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2013 Google, Inc. All rights reserved. + * Copyright (c) 2013-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DBGHELP_IMPORTS_H_ -#define _DBGHELP_IMPORTS_H_ 1 +#define _DBGHELP_IMPORTS_H_ #if _MSC_VER <= 1400 /* VS2005- */ /* Not present in VS2005 DbgHelp.h. Our own dbghelp_imports.lib lets us link. diff --git a/ext/drsyms/drsyms.h b/ext/drsyms/drsyms.h index 3bc6370991..c92ce2e77e 100644 --- a/ext/drsyms/drsyms.h +++ b/ext/drsyms/drsyms.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2014 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2009-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -47,7 +47,7 @@ */ #ifndef _DRSYMS_H_ -#define _DRSYMS_H_ 1 +#define _DRSYMS_H_ /** * @file drsyms.h diff --git a/ext/drsyscall/drsyscall.h b/ext/drsyscall/drsyscall.h index e8ede57199..8ad4e9d185 100644 --- a/ext/drsyscall/drsyscall.h +++ b/ext/drsyscall/drsyscall.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2012-2024 Google, Inc. All rights reserved. + * Copyright (c) 2012-2025 Google, Inc. All rights reserved. * **********************************************************/ /* Dr. Memory: the memory debugger @@ -20,7 +20,7 @@ */ #ifndef _DR_SYSCALL_H_ -#define _DR_SYSCALL_H_ 1 +#define _DR_SYSCALL_H_ /* Dr. Syscall: DynamoRIO System Call Extension */ diff --git a/ext/drsyscall/drsyscall_driver.h b/ext/drsyscall/drsyscall_driver.h index 8c1f083d1e..d32ee06252 100644 --- a/ext/drsyscall/drsyscall_driver.h +++ b/ext/drsyscall/drsyscall_driver.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2012 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * **********************************************************/ /* Dr. Memory: the memory debugger @@ -20,7 +20,7 @@ */ #ifndef _SYSCALL_DRIVER_H_ -#define _SYSCALL_DRIVER_H_ 1 +#define _SYSCALL_DRIVER_H_ void driver_init(void); diff --git a/ext/drsyscall/drsyscall_os.h b/ext/drsyscall/drsyscall_os.h index 8d2cbe8df5..d22add73be 100644 --- a/ext/drsyscall/drsyscall_os.h +++ b/ext/drsyscall/drsyscall_os.h @@ -21,7 +21,7 @@ */ #ifndef _DRSYSCALL_OS_H_ -#define _DRSYSCALL_OS_H_ 1 +#define _DRSYSCALL_OS_H_ #include "utils.h" diff --git a/ext/drsyscall/drsyscall_record.h b/ext/drsyscall/drsyscall_record.h index c7a858d64a..4f333f241a 100644 --- a/ext/drsyscall/drsyscall_record.h +++ b/ext/drsyscall/drsyscall_record.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2025 Google, Inc. All rights reserved. + * Copyright (c) 2025-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DRSYSCALL_RECORD_H_ -#define _DRSYSCALL_RECORD_H_ 1 +#define _DRSYSCALL_RECORD_H_ #include #include "dr_api.h" diff --git a/ext/drsyscall/drsyscall_record_lib.h b/ext/drsyscall/drsyscall_record_lib.h index ed84332f27..cd8d20b13a 100644 --- a/ext/drsyscall/drsyscall_record_lib.h +++ b/ext/drsyscall/drsyscall_record_lib.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2025 Google, Inc. All rights reserved. + * Copyright (c) 2025-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -30,7 +30,7 @@ * DAMAGE. */ #ifndef _DRSYSCALL_RECORD_LIB_H_ -#define _DRSYSCALL_RECORD_LIB_H_ 1 +#define _DRSYSCALL_RECORD_LIB_H_ #include #include diff --git a/ext/drsyscall/drsyscall_windows.h b/ext/drsyscall/drsyscall_windows.h index a71dcd6ca6..f74f7447ea 100644 --- a/ext/drsyscall/drsyscall_windows.h +++ b/ext/drsyscall/drsyscall_windows.h @@ -20,7 +20,7 @@ */ #ifndef _DRSYSCALL_WINDOWS_H_ -#define _DRSYSCALL_WINDOWS_H_ 1 +#define _DRSYSCALL_WINDOWS_H_ /* drsyscall_windows.c */ diff --git a/ext/drsyscall/linux_defines.h b/ext/drsyscall/linux_defines.h index 9744f5e848..f7581feca8 100644 --- a/ext/drsyscall/linux_defines.h +++ b/ext/drsyscall/linux_defines.h @@ -21,7 +21,7 @@ */ #ifndef _LINUX_DEFINES_H -#define _LINUX_DEFINES_H 1 +#define _LINUX_DEFINES_H /* for linux-specific types/defines for fcntl and ipc */ #define __USE_GNU 1 @@ -73,7 +73,7 @@ #include /* struct __sysctl_args */ /* block bits/stat.h which is included from fcntl.h on FC16 (glibc 2.14) */ -#define _BITS_STAT_H 1 +#define _BITS_STAT_H #include /* F_GETFD, etc. */ #ifdef X86 diff --git a/ext/drsyscall/table_defines.h b/ext/drsyscall/table_defines.h index c56b0d52e2..d0f1f68853 100644 --- a/ext/drsyscall/table_defines.h +++ b/ext/drsyscall/table_defines.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2011-2018 Google, Inc. All rights reserved. + * Copyright (c) 2011-2025 Google, Inc. All rights reserved. * Copyright (c) 2007-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -25,7 +25,7 @@ */ #ifndef _TABLE_DEFINES_H -#define _TABLE_DEFINES_H 1 +#define _TABLE_DEFINES_H #define OK (SYSINFO_ALL_PARAMS_KNOWN) #define UNKNOWN 0 diff --git a/ext/drutil/drutil.h b/ext/drutil/drutil.h index 55b998cfd6..69faf4a618 100644 --- a/ext/drutil/drutil.h +++ b/ext/drutil/drutil.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * **********************************************************/ /* drutil: DynamoRIO Instrumentation Utilities @@ -23,7 +23,7 @@ /* DynamoRIO Instrumentation Utilities Extension */ #ifndef _DRUTIL_H_ -#define _DRUTIL_H_ 1 +#define _DRUTIL_H_ /** * @file drutil.h diff --git a/ext/drwrap/drwrap.h b/ext/drwrap/drwrap.h index 7be4587973..7f59d80d43 100644 --- a/ext/drwrap/drwrap.h +++ b/ext/drwrap/drwrap.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2023 Google, Inc. All rights reserved. + * Copyright (c) 2010-2025 Google, Inc. All rights reserved. * **********************************************************/ /* drwrap: DynamoRIO Function Wrapping and Replacing Extension @@ -23,7 +23,7 @@ /* DynamoRIO Function Wrapping and Replacing Extension */ #ifndef _DRWRAP_H_ -#define _DRWRAP_H_ 1 +#define _DRWRAP_H_ /** * @file drwrap.h diff --git a/ext/drx/drx.h b/ext/drx/drx.h index 89221c7b0a..ae3fcc923d 100644 --- a/ext/drx/drx.h +++ b/ext/drx/drx.h @@ -33,7 +33,7 @@ /* DynamoRio eXtension utilities */ #ifndef _DRX_H_ -#define _DRX_H_ 1 +#define _DRX_H_ /** * @file drx.h diff --git a/make/configure.cmake.h b/make/configure.cmake.h index 1cfc819aae..2bbc8037bd 100644 --- a/make/configure.cmake.h +++ b/make/configure.cmake.h @@ -37,7 +37,7 @@ /* We disable formatting as it messes up the ${var} references: */ /* clang-format off */ #ifndef _CONFIGURE_H_ -#define _CONFIGURE_H_ 1 +#define _CONFIGURE_H_ /* exposed options */ #cmakedefine INTERNAL diff --git a/suite/tests/api/detach_state_shared.h b/suite/tests/api/detach_state_shared.h index a0b387fee6..17fb08df6e 100644 --- a/suite/tests/api/detach_state_shared.h +++ b/suite/tests/api/detach_state_shared.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2015-2021 Google, Inc. All rights reserved. + * Copyright (c) 2015-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _DETACH_STATE_SHARED_H_ -#define _DETACH_STATE_SHARED_H_ 1 +#define _DETACH_STATE_SHARED_H_ #define MAKE_HEX_ASM(n) HEX(n) #define MAKE_HEX(n) 0x##n diff --git a/suite/tests/client-interface/annotation/test_annotation_arguments.h b/suite/tests/client-interface/annotation/test_annotation_arguments.h index f9402c8f7b..543070fd4a 100644 --- a/suite/tests/client-interface/annotation/test_annotation_arguments.h +++ b/suite/tests/client-interface/annotation/test_annotation_arguments.h @@ -1,5 +1,5 @@ /* ****************************************************** - * Copyright (c) 2014 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * ******************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _TEST_ANNOTATION_ARGUMENTS_H_ -#define _TEST_ANNOTATION_ARGUMENTS_H_ 1 +#define _TEST_ANNOTATION_ARGUMENTS_H_ #include "dr_annotations_asm.h" diff --git a/suite/tests/client-interface/annotation/test_mode_annotations.h b/suite/tests/client-interface/annotation/test_mode_annotations.h index 26ddda3185..078e432d81 100644 --- a/suite/tests/client-interface/annotation/test_mode_annotations.h +++ b/suite/tests/client-interface/annotation/test_mode_annotations.h @@ -1,5 +1,5 @@ /* ****************************************************** - * Copyright (c) 2014-2020 Google, Inc. All rights reserved. + * Copyright (c) 2014-2025 Google, Inc. All rights reserved. * ******************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _TEST_MODE_ANNOTATIONS_H_ -#define _TEST_MODE_ANNOTATIONS_H_ 1 +#define _TEST_MODE_ANNOTATIONS_H_ #include "dr_annotations_asm.h" diff --git a/suite/tests/client-interface/avx512ctx-shared.h b/suite/tests/client-interface/avx512ctx-shared.h index 3d1f756071..ef6ffa1d12 100644 --- a/suite/tests/client-interface/avx512ctx-shared.h +++ b/suite/tests/client-interface/avx512ctx-shared.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2019 Google, Inc. All rights reserved. + * Copyright (c) 2019-2025 Google, Inc. All rights reserved. * **********************************************************/ /* @@ -31,7 +31,7 @@ */ #ifndef _AVX512CTX_SHARED_H_ -#define _AVX512CTX_SHARED_H_ 1 +#define _AVX512CTX_SHARED_H_ #ifndef __AVX512F__ # error "Build error, should only be added with AVX-512 support."