tilegx: move TILEGX_NUM_PIPELINE_ENCODINGS to tilegx_pipeline enum

Its closely related to what the encodings are, more than a set of random
constants, so it seems to make sense to put it here.

include/ChangeLog:

2016-06-22  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* opcode/tilegx.h: Move TILEGX_NUM_PIPELINE_ENCODINGS into
	tilegx_pipeline.

diff --git a/include/ChangeLog b/include/ChangeLog
index a9f380fda958c0274671d5f9db7ceebafbbcc74a..58f279f3afd7716f1c3de6fee4374536ad8bee13 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-22  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+       * opcode/tilegx.h: Move TILEGX_NUM_PIPELINE_ENCODINGS into
+       tilegx_pipeline.
+
 2016-06-21  Graham Markall  <graham.markall@embecosm.com>
 
        * opcode/arc.h: Add nps400 extension and instruction

diff --git a/include/opcode/tilegx.h b/include/opcode/tilegx.h
index 349058317f00fffa03a03b983ec0f7dd6d271bc3..598541032c1406574a8e7922f9cbbfb1e5b6a5d2 100644 (file)
--- a/include/opcode/tilegx.h
+++ b/include/opcode/tilegx.h
@@ -1130,6 +1130,7 @@ typedef enum
   TILEGX_PIPELINE_Y0,
   TILEGX_PIPELINE_Y1,
   TILEGX_PIPELINE_Y2,
+  TILEGX_NUM_PIPELINE_ENCODINGS = 5,
 } tilegx_pipeline;
 
 #define tilegx_is_x_pipeline(p) ((int)(p) <= (int)TILEGX_PIPELINE_X1)
@@ -1150,9 +1151,6 @@ enum
   /* Maximum number of instructions in a bundle (2 for X, 3 for Y). */
   TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE = 3,
 
-  /* How many different pipeline encodings are there? X0, X1, Y0, Y1, Y2. */
-  TILEGX_NUM_PIPELINE_ENCODINGS = 5,
-
   /* Log base 2 of TILEGX_BUNDLE_SIZE_IN_BYTES. */
   TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES = 3,