Changeset 497

Timestamp:

Feb 8, 2015, 2:42:47 PM (10 years ago)

Author:

alain

Message:

Cosmetic

File:

• soft/giet_vm/giet_python/mapping.py (modified) (6 diffs)

soft/giet_vm/giet_python/mapping.py

@@ -170 +170 @@
         self.signature      = MAPPING_SIGNATURE
         self.name           = name
+        self.name           = name
         self.paddr_width    = paddr_width
         self.coherence      = coherence
@@ -217 +218 @@
                 size ):                # pseg length (bytes)
 
-        # computes coordinates from the base address extension
+        # computes cluster index and coordinates from the base address
         paddr_lsb_width = self.paddr_width - self.x_width - self.y_width
         cluster_xy = base >> paddr_lsb_width
-        x = cluster_xy >> (self.y_width);
-        y = cluster_xy & ((1 << self.y_width) - 1)
+        x          = cluster_xy >> (self.y_width);
+        y          = cluster_xy & ((1 << self.y_width) - 1)
+        cluster_id = (x * self.y_size) + y
 
         assert (base & VPN_ANTI_MASK) == 0
@@ -230 +232 @@
 
         assert ( size == self.ram_size )
-
-        cluster_id = (x * self.y_size) + y
 
         # add one pseg in the mapping
@@ -251 +251 @@
                    arg      = 0 ):     # optional argument (semantic depends on ptype)
 
-        # check cluster coordinates (obtained from the base address)
+        # computes cluster index and coordinates from the base address
         cluster_xy = base >> (self.paddr_width - self.x_width - self.y_width)
-        x = cluster_xy >> (self.y_width);
-        y = cluster_xy & ((1 << self.y_width) - 1)
+        x          = cluster_xy >> (self.y_width);
+        y          = cluster_xy & ((1 << self.y_width) - 1)
+        cluster_id = (x * self.y_size) + y
 
         assert (x < self.x_size) and (y < self.y_size)
@@ -263 +264 @@
 
         assert subtype in PERIPHSUBTYPES
-
-        cluster_id = (x * self.y_size) + y
 
         # add one pseg into mapping
@@ -1091 +1090 @@
         if self.use_ramdisk:
             for vseg in self.globs:
-                if ( vseg.name == 'seg_rdk' ):
+                if ( vseg.name == 'seg_ramdisk' ):
                     seg_rdk_base  = vseg.vbase
                     seg_rdk_size  = vseg.vobjs[0].length