intel: Move tools/decoder.[ch] to common/gen_decoder.[ch].

This way they become part of libintel_common.la so I can use them in
the i965 driver.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 4eaf380..839ea47 100644 (file)
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -9,6 +9,8 @@ BLORP_FILES = \
 COMMON_FILES = \
        common/gen_debug.c \
        common/gen_debug.h \
+       common/gen_decoder.c \
+       common/gen_decoder.h \
        common/gen_device_info.c \
        common/gen_device_info.h \
        common/gen_l3_config.c \

diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
index 3c98c81..245bd03 100644 (file)
--- a/src/intel/Makefile.tools.am
+++ b/src/intel/Makefile.tools.am
@@ -23,8 +23,6 @@ noinst_PROGRAMS += tools/aubinator
 
 tools_aubinator_SOURCES = \
        tools/aubinator.c \
-       tools/decoder.c \
-       tools/decoder.h \
        tools/disasm.c \
        tools/gen_disasm.h
 

diff --git a/src/intel/tools/decoder.c b/src/intel/common/gen_decoder.c
similarity index 99%
rename from src/intel/tools/decoder.c
rename to src/intel/common/gen_decoder.c
index 42eed4a..1c3246f 100644 (file)
--- a/src/intel/tools/decoder.c
+++ b/src/intel/common/gen_decoder.c
@@ -32,7 +32,7 @@
 
 #include <util/macros.h>
 
-#include "decoder.h"
+#include "gen_decoder.h"
 
 #include "genxml/gen6_xml.h"
 #include "genxml/gen7_xml.h"

diff --git a/src/intel/tools/decoder.h b/src/intel/common/gen_decoder.h
similarity index 98%
rename from src/intel/tools/decoder.h
rename to src/intel/common/gen_decoder.h
index 4352dea..1c41de8 100644 (file)
--- a/src/intel/tools/decoder.h
+++ b/src/intel/common/gen_decoder.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef DECODER_H
-#define DECODER_H
+#ifndef GEN_DECODER_H
+#define GEN_DECODER_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -135,4 +135,4 @@ void gen_print_group(FILE *out,
                      uint64_t offset, const uint32_t *p,
                      int starting_dword, bool color);
 
-#endif /* DECODER_H */
+#endif /* GEN_DECODER_H */

diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c
index 42cff8c..68fd18c 100644 (file)
--- a/src/intel/tools/aubinator.c
+++ b/src/intel/tools/aubinator.c
@@ -39,7 +39,7 @@
 
 #include "util/macros.h"
 
-#include "decoder.h"
+#include "common/gen_decoder.h"
 #include "intel_aub.h"
 #include "gen_disasm.h"