3 files changed, 5 insertions, 72 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 78b9269..8776fbd 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-28  John Darrington <john@darrington.wattle.id.au>
+
+        * s12z.h: Delete.
+
 2018-08-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-dis.c (OP_E_memory): In 64-bit mode, display eiz for
diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c
index 47f8616..7130908 100644
--- a/opcodes/s12z-dis.c
+++ b/opcodes/s12z-dis.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "s12z.h"
+#include "opcode/s12z.h"
 
 #include "bfd.h"
 #include "dis-asm.h"
diff --git a/opcodes/s12z.h b/opcodes/s12z.h
deleted file mode 100644
index 7e38ac5..0000000
--- a/opcodes/s12z.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef S12Z_H
-#define S12Z_H
-
-/* This byte is used to prefix instructions in "page 2" of the opcode
-   space */
-#define PAGE2_PREBYTE (0x1b)
-
-struct reg
-{
-  char      *name;   /* The canonical name of the register */
-  int       bytes;   /* its size, in bytes */
-};
-
-
-/* How many registers do we have.  Actually there are only 13,
-   because CCL and CCH are the low and high bytes of CCW.  But
-   for assemnbly / disassembly purposes they are considered
-   distinct registers. */
-#define S12Z_N_REGISTERS 15
-
-extern const struct reg registers[S12Z_N_REGISTERS];
-
-enum {
-    REG_D2 = 0,
-    REG_D3,
-    REG_D4,
-    REG_D5,
-    REG_D0,
-    REG_D1,
-    REG_D6,
-    REG_D7,
-    REG_X,
-    REG_Y,
-    REG_S,
-    REG_P,
-    REG_CCH,
-    REG_CCL,
-    REG_CCW
-  };
-
-/* Any of the registers d0, d1, ... d7 */
-#define REG_BIT_Dn \
-((0x1U << REG_D2) | \
- (0x1U << REG_D3) | \
- (0x1U << REG_D4) | \
- (0x1U << REG_D5) | \
- (0x1U << REG_D6) | \
- (0x1U << REG_D7) | \
- (0x1U << REG_D0) | \
- (0x1U << REG_D1))
-
-/* Any of the registers x, y or z */
-#define REG_BIT_XYS \
-((0x1U << REG_X) | \
- (0x1U << REG_Y) | \
- (0x1U << REG_S))
-
-/* Any of the registers x, y, z or p */
-#define REG_BIT_XYSP \
-((0x1U << REG_X)  | \
- (0x1U << REG_Y)  | \
- (0x1U << REG_S)  | \
- (0x1U << REG_P))
-
-/* The x register or the y register */
-#define REG_BIT_XY \
-((0x1U << REG_X) | \
- (0x1U << REG_Y))
-
-
-#endif