summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-28 02:20:04 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-28 02:20:04 +1100
commit60ab9de82f02300faea72a09e6b275fc051f78b0 (patch)
tree095e510bd48c0f35d5eb3ea4d4419b34da52ec59 /src/devices/cpu
parentcbf834f204f814a66c9cf60d51c7911d6953d10e (diff)
get #include guards in line with filenames, avoid expensive things in static initialisation (nw)
Diffstat (limited to 'src/devices/cpu')
-rw-r--r--src/devices/cpu/ks0164/ks0164d.h9
-rw-r--r--src/devices/cpu/xavix2/xavix2d.h7
2 files changed, 7 insertions, 9 deletions
diff --git a/src/devices/cpu/ks0164/ks0164d.h b/src/devices/cpu/ks0164/ks0164d.h
index ebc3adc2655..4383fbd7388 100644
--- a/src/devices/cpu/ks0164/ks0164d.h
+++ b/src/devices/cpu/ks0164/ks0164d.h
@@ -3,8 +3,8 @@
// KS0164 disassembler
-#ifndef MAME_CPU_KS0164_KS0164DASM_H
-#define MAME_CPU_KS0164_KS0164DASM_H
+#ifndef MAME_CPU_KS0164_KS0164D_H
+#define MAME_CPU_KS0164_KS0164D_H
#pragma once
@@ -21,7 +21,7 @@ private:
struct instruction {
u16 value;
u16 mask;
- std::function<u32 (std::ostream &, u32, const data_buffer &, u32)> cb;
+ u32 (*cb)(std::ostream &, u32, const data_buffer &, u32);
};
static const instruction instructions[];
@@ -31,5 +31,4 @@ private:
static std::string off16(s16 dt);
};
-#endif
-
+#endif // MAME_CPU_KS0164_KS0164D_H
diff --git a/src/devices/cpu/xavix2/xavix2d.h b/src/devices/cpu/xavix2/xavix2d.h
index cd049e423fd..409fac0da0e 100644
--- a/src/devices/cpu/xavix2/xavix2d.h
+++ b/src/devices/cpu/xavix2/xavix2d.h
@@ -3,8 +3,8 @@
// Xavix2 disassembler
-#ifndef MAME_CPU_XAVIX2_XAVIX2DASM_H
-#define MAME_CPU_XAVIX2_XAVIX2DASM_H
+#ifndef MAME_CPU_XAVIX2_XAVIX2D_H
+#define MAME_CPU_XAVIX2_XAVIX2D_H
#pragma once
@@ -50,5 +50,4 @@ private:
std::string rel8();
};
-#endif
-
+#endif // MAME_CPU_XAVIX2_XAVIX2D_H