From 88312c05e1aa4f79639eed7cc95390bde5c87c9a Mon Sep 17 00:00:00 2001
From: Ruiling Song <ruiling.song@intel.com>
Date: Mon, 28 Jul 2014 09:19:29 +0800
Subject: [PATCH] GBE: align the fields in union ImageInfoKey.

To avoid possible garbage data.

Signed-off-by: Ruiling Song <ruiling.song@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
---
 backend/src/ir/image.hpp       | 2 +-
 backend/src/ir/instruction.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/ir/image.hpp b/backend/src/ir/image.hpp
index a79e0a3..82fee56 100644
--- a/backend/src/ir/image.hpp
+++ b/backend/src/ir/image.hpp
@@ -93,7 +93,7 @@ namespace ir {
   private:
     map<Register, struct ImageInfo *> regMap;
     map<uint32_t, struct ImageInfo *> indexMap;
-    map<uint32_t, Register> infoRegMap;
+    map<uint16_t, Register> infoRegMap;
     GBE_CLASS(ImageSet);
   };
 } /* namespace ir */
diff --git a/backend/src/ir/instruction.hpp b/backend/src/ir/instruction.hpp
index 5f0cb05..ada780f 100644
--- a/backend/src/ir/instruction.hpp
+++ b/backend/src/ir/instruction.hpp
@@ -375,7 +375,7 @@ namespace ir {
      uint8_t index; /*! the allocated image index */
      uint8_t  type;  /*! the information type */
     };
-    uint32_t data;
+    uint16_t data;
   } ImageInfoKey;
 
   /*! Get image information */
-- 
2.7.4