DynamoRIO · derekbruening · Dec 30, 2025 · Dec 30, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 <fstream>
 

diff --git 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 <fstream>
 

diff --git 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 <cstdint>
 

diff --git 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 <assert.h>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 <stdint.h>
 #include <stddef.h> // for size_t

diff --git 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 <cstdint>
 #include <string>

diff --git 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 <mutex>
 #include <thread>

diff --git 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 <string>
 #ifdef WINDOWS

diff --git 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
@@ -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 <cstdint>
 #include <fstream>

diff --git 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 <cstddef>
 #include "crc32c.h"

diff --git 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
@@ -41,7 +41,7 @@
  */
 
 #ifndef _TRACE_ENTRY_H_
-#define _TRACE_ENTRY_H_ 1
+#define _TRACE_ENTRY_H_
 
 #include <memory>
 #include <stddef.h>

diff --git 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 <stdint.h>
 #include <stdio.h>

diff --git 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
@@ -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 <iostream>
 #include <fstream>

diff --git 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
@@ -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
@@ -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 <stdint.h>
 #include <sys/stat.h>

diff --git 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