caveat: introduce header guards

diff --git a/caveat/arith.h b/caveat/arith.h
index 4757e84ae31ffba3b13590de0e6aa7f93a213f63..86bc82529438c25d35f164dbeaffca71e45ed625 100644 (file)
--- a/caveat/arith.h
+++ b/caveat/arith.h
@@ -2,6 +2,7 @@
   Copyright (c) 2020 Peter Hsu.  All Rights Reserved.  See LICENCE file for details.
 */
 
+#pragma once
 
 #define F32_SIGN (0x1  << 31)
 #define F64_SIGN (0x1L << 63)

diff --git a/caveat/caveat.h b/caveat/caveat.h
index 953d40b5108cbbf337b0af4e3117efde48902146..44b94c9811b1b8c9fb302873cb2f0c6b0ff8a642 100644 (file)
--- a/caveat/caveat.h
+++ b/caveat/caveat.h
@@ -2,8 +2,7 @@
   Copyright (c) 2020 Peter Hsu.  All Rights Reserved.  See LICENCE file for details.
 */
 
-#ifndef CAVEAT_H
-#define CAVEAT_H
+#pragma once
 
 /*
   Caveat trace records are a kind of instruction set with a 7-bit 'opcode'.
@@ -175,7 +174,3 @@ extern const char* usage;
 
 void help_exit();
 int parse_options( const char** argv );
-
-
-
-#endif

diff --git a/caveat/caveat_fp.h b/caveat/caveat_fp.h
index 2141c0eaeb198318e010e38b4d7d672203327db1..41d171a4ddf2f45727d66c0698382192ee65a641 100644 (file)
--- a/caveat/caveat_fp.h
+++ b/caveat/caveat_fp.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define SOFT_FP
 #ifndef NO_FP_MACROS
 #define FMADD32( rm, rd, rs1, rs2, rs3) SRM(rm); FR(rd).f32 = f32_mulAdd( F32(rs1), F32(rs2),  F32(rs3)); SET_FPX; SRM(cpu->state.fcsr.rmode);

diff --git a/caveat/core.h b/caveat/core.h
index 4879c3eaf9e074b3fbab2f3e2083e63cde8a7ad1..58cad2227df940cf5f6bd0e8b468a8e61a9e71f0 100644 (file)
--- a/caveat/core.h
+++ b/caveat/core.h
@@ -2,6 +2,7 @@
   Copyright (c) 2020 Peter Hsu.  All Rights Reserved.  See LICENCE file for details.
 */
 
+#pragma once
 
 #define sex(rd)  IR(rd).l  = IR(rd).l  << 32 >> 32
 #define zex(rd)  IR(rd).ul = IR(rd).ul << 32 >> 32
@@ -61,4 +62,3 @@ void slow_sim(struct core_t*, long max_count);
 int proxy_ecall( struct core_t* cpu );
 void proxy_csr( struct core_t* cpu, const struct insn_t* p, int which );
 void status_report(struct core_t* cpu, FILE*);
-

diff --git a/caveat/insn.h b/caveat/insn.h
index 9089d2bc8c2e69e7c177d76134f396755dbb28be..abee30e1eaa9dac7fd9d8ae14acacc24f8cce498 100644 (file)
--- a/caveat/insn.h
+++ b/caveat/insn.h
@@ -2,6 +2,8 @@
   Copyright (c) 2020 Peter Hsu.  All Rights Reserved.  See LICENCE file for details.
 */
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/caveat/shmfifo.h b/caveat/shmfifo.h
index a382e090d55ff3002db4d885d3d05e0b95f3abf6..1a4afe04bf69f59b1ccab4867b7a1ea240f94b34 100644 (file)
--- a/caveat/shmfifo.h
+++ b/caveat/shmfifo.h
@@ -2,6 +2,8 @@
   Copyright (c) 2020 Peter Hsu.  All Rights Reserved.  See LICENCE file for details.
 */
 
+#pragma once
+
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <linux/futex.h>

diff --git a/caveat/sim_body.h b/caveat/sim_body.h
index 686713f252cc83398df36f37f576c9cabafb2340..6d2d7ed17bd0371fe6d61cf8d8ed20646f3028a7 100644 (file)
--- a/caveat/sim_body.h
+++ b/caveat/sim_body.h
@@ -1,9 +1,6 @@
 // See LICENSE for license details.
 
-
-#ifndef SIM_BODY_H
-#define SIM_BODY_H
-
+#pragma once
 
 #define  IR(rn)  cpu->reg[rn]
 #define  FR(rn)  cpu->reg[rn]
@@ -114,6 +111,3 @@ inline float64_t NF64(int rn)  { float64_t x=F64(rn); x.v^=F64_SIGN; return x; }
   cpu->pc = PC;  // program counter cached in register
   cpu->counter.insn_executed += max_count-countdown;
 }
-
-
-#endif