Changeset 4114 for proto

Timestamp:

Aug 30, 2014, 10:53:38 PM (4 years ago)

Author:

ksherdy

Message:

Dropped Bitfield type added array of BitBlocks?.

File:

• proto/s2k/trunk/framework/input/grammar/scatter/b2k.scatter (modified) (5 diffs)

proto/s2k/trunk/framework/input/grammar/scatter/b2k.scatter

@@ -46 +46 @@
         VOID,
         BOOL,
-        BITFIELD         "BitField",
+        //BITFIELD         "BitField",
         BITBLOCK         "BitBlock", 
         //CODEBLOCK,
@@ -82 +82 @@
 interfaces {
     intValued {int value = 0;},
+    hasFieldWidth   {int fieldWidth = 1;},
 }
 
@@ -90 +91 @@
     funcCall                {}                     [funcCallRest],
     idisaFuncCall           {}                     [idisaFuncCallRest],
+    bitBlockType            {hasFieldWidth;}  [],
     integerConstant         {intValued;}           [fieldWidthSpecifier],  // codeBlockWidthSpecifier ],
     // primitiveType        {}                     [intType voidType boolType bitBlockType], // KH: update S2B 
@@ -211 +213 @@
     //
     type                #-> primitiveType   |
-                            bitFieldType    |
+                            // bitFieldType    |
                             structType      |
                             kernelType      ;
@@ -220 +222 @@
     voidType            ->  VOID ;      // { @type = {{PrimitiveType.VOID}}; } ; // KH: ?
     boolType            ->  BOOL ;      // { @type = {{PrimitiveType.BOOL}}; } ;
-    bitBlockType        ->  BITBLOCK ;  // { @type = {{PrimitiveType.BITBLOCK}}; } ;
-    
-    bitFieldType        ->  BITFIELD  fieldWidthSpecifier! 
-                                            {   @fieldWidth = @:value;
-                                            // @type = {{ new BitFieldType(%?) }} , @fieldWidth ;
-                                            } ;
+    bitBlockType        ->  BITBLOCK fieldWidthSpecifier! {   @fieldWidth = @:value;
+                                                                    //@fieldWidth ; // KH ?
+                                                                } ;
+
+    // bitFieldType        ->  BITFIELD  fieldWidthSpecifier! 
+    //                                        {   @fieldWidth = @:value;
+    //                                        // @type = {{ new BitFieldType(%?) }} , @fieldWidth ;
+    //                                        } ;
 
     fieldWidthSpecifier    #-> (LANGLE integerConstant RANGLE ) 
                             | (epsilon {@value = 1;}) ;
-    
+
     structType             ->  STRUCT identifier ; 
     kernelType             -> KERNEL identifier ;