commit b1771ef128b10c4d4575634828006bfba20b1d9c
author Zonr Chang <zonr@google.com> Fri Oct 22 18:03:46 2010 +0800
committer Zonr Chang <zonr@google.com> Fri Oct 22 18:03:46 2010 +0800
tree a568a9ecaf1e2070dc28d1e25d90e8aed3980e05
parent 66a1a5abf5f2f771d33d6b70a84a1efd7fb22f23

Exclude rs_matrixNxN from being RS object type.

rs_matrix{2x2, 3x3, 4x4} (RS matrix type) is very different than RS
object type like rs_allocation. This commit teaches llvm-rs-cc to learn
it.

NOTE: Currenrly RS matrix type + RS object type = RS specific type.

slang_rs_export_type.cpp

diff --git a/slang_rs_export_type.cpp b/slang_rs_export_type.cpp
index 300d5f4..7cdf8ba 100644
--- a/slang_rs_export_type.cpp
+++ b/slang_rs_export_type.cpp
@@ -172,7 +172,7 @@
       }
     }
     case clang::Type::Record: {
-      if (RSExportPrimitiveType::GetRSObjectType(T) !=
+      if (RSExportPrimitiveType::GetRSSpecificType(T) !=
           RSExportPrimitiveType::DataTypeUnknown)
         return T;  // RS object type, no further checks are needed
 
@@ -281,7 +281,7 @@
   switch (T->getTypeClass()) {
     case clang::Type::Record: {
       RSExportPrimitiveType::DataType dt =
-          RSExportPrimitiveType::GetRSObjectType(TypeName);
+          RSExportPrimitiveType::GetRSSpecificType(TypeName);
       switch (dt) {
         case RSExportPrimitiveType::DataTypeUnknown: {
           // User-defined types
@@ -421,8 +421,8 @@
 }
 
 /************************** RSExportPrimitiveType **************************/
-llvm::ManagedStatic<RSExportPrimitiveType::RSObjectTypeMapTy>
-RSExportPrimitiveType::RSObjectTypeMap;
+llvm::ManagedStatic<RSExportPrimitiveType::RSSpecificTypeMapTy>
+RSExportPrimitiveType::RSSpecificTypeMap;
 
 llvm::Type *RSExportPrimitiveType::RSObjectLLVMType = NULL;
 
@@ -434,30 +434,41 @@
 }
 
 RSExportPrimitiveType::DataType
-RSExportPrimitiveType::GetRSObjectType(const llvm::StringRef &TypeName) {
+RSExportPrimitiveType::GetRSSpecificType(const llvm::StringRef &TypeName) {
   if (TypeName.empty())
     return DataTypeUnknown;
 
-  if (RSObjectTypeMap->empty()) {
+  if (RSSpecificTypeMap->empty()) {
+#define ENUM_RS_MATRIX_TYPE(type, cname, dim)                       \
+    RSSpecificTypeMap->GetOrCreateValue(cname, DataType ## type);
+#include "RSMatrixTypeEnums.inc"
 #define ENUM_RS_OBJECT_TYPE(type, cname)                            \
-    RSObjectTypeMap->GetOrCreateValue(cname, DataType ## type);
+    RSSpecificTypeMap->GetOrCreateValue(cname, DataType ## type);
 #include "RSObjectTypeEnums.inc"
   }
 
-  RSObjectTypeMapTy::const_iterator I = RSObjectTypeMap->find(TypeName);
-  if (I == RSObjectTypeMap->end())
+  RSSpecificTypeMapTy::const_iterator I = RSSpecificTypeMap->find(TypeName);
+  if (I == RSSpecificTypeMap->end())
     return DataTypeUnknown;
   else
     return I->getValue();
 }
 
 RSExportPrimitiveType::DataType
-RSExportPrimitiveType::GetRSObjectType(const clang::Type *T) {
+RSExportPrimitiveType::GetRSSpecificType(const clang::Type *T) {
   T = GET_CANONICAL_TYPE(T);
   if ((T == NULL) || (T->getTypeClass() != clang::Type::Record))
     return DataTypeUnknown;
 
-  return GetRSObjectType( RSExportType::GetTypeName(T) );
+  return GetRSSpecificType( RSExportType::GetTypeName(T) );
+}
+
+bool RSExportPrimitiveType::IsRSMatrixType(DataType DT) {
+  return ((DT >= FirstRSMatrixType) && (DT <= LastRSMatrixType));
+}
+
+bool RSExportPrimitiveType::IsRSObjectType(DataType DT) {
+  return ((DT >= FirstRSObjectType) && (DT <= LastRSObjectType));
 }
 
 const size_t RSExportPrimitiveType::SizeOfDataTypeInBits[] = {
@@ -500,8 +511,7 @@
     }
     case clang::Type::Record: {
       // must be RS object type
-      return RSExportPrimitiveType::GetRSObjectType(T);
-      break;
+      return RSExportPrimitiveType::GetRSSpecificType(T);
     }
     default: {
       fprintf(stderr, "RSExportPrimitiveType::GetDataType : type '%s' is not "