Added debug output to map tool

1 files changed, 26 insertions, 9 deletions

diff --git a/map-tool/maptool.py b/map-tool/maptool.py
index 3f1306a..1fe3e98 100755
--- a/map-tool/maptool.py
+++ b/map-tool/maptool.py
@@ -501,6 +501,7 @@ class mapToolCfg:
         __nmlLoader = None

         __prelinkCmdFileName = None

         __imageDir = None

+        __fsOffsetsFileName = None

 

         def __init__(self,cfgFile):

                 self.__cfgFilename = cfgFile

@@ -508,6 +509,7 @@ class mapToolCfg:
                 self.__activationRecordsDir = './tmp/ar'

                 self.__fileSystemDir = './tmp/fs'

                 self.__imageDir = './images'

+                self.__fsOffsetsFileName = os.path.join('./tmp', 'fsOffsets.txt')

                 if not os.path.exists(self.__activationRecordsDir):

                         os.makedirs(self.__activationRecordsDir)

                 if not os.path.exists(self.__fileSystemDir):

@@ -542,6 +544,9 @@ class mapToolCfg:
         def getPrelinkCmdFileName(self):

                 return self.__prelinkCmdFileName        

                 

+        def getfsOffsetsFileName(self):

+                return self.__fsOffsetsFileName

+                

         # Parse the MAP tool configuration file

         def parseFile(self):

                 if os.path.isfile(self.__cfgFilename) != True:

@@ -852,6 +857,14 @@ class fileSystem:
                         f.dump()

                         print''

         

+        def dumpFileoffsets(self, outFname):

+                __fContent = []

+                for __file in self.fileList:

+                        __offset = __file.getFileOffset()

+                        __offsetStr = __file.getName() + ':' + '\t' + dec2hex(__offset)

+                        __fContent.append(__offsetStr)  

+                writeFile(outFname, __fContent)

+                        

         def genFsImage(self, outFileName):

                 # Run the filesystem generator

                 genRomFs(outFileName, self.rootDir, 'MadLoadImage', self.__fsGenList)

@@ -2000,6 +2013,7 @@ ofdTool = mapCfg.getOfdTool()
 malLoader = mapCfg.getMalLoader()

 nmlLoader = mapCfg.getNmlLoader()

 prelinkCmdFileName = mapCfg.getPrelinkCmdFileName()

+fsOffsetsFileName = mapCfg.getfsOffsetsFileName()

 

 dc = deploymentConfig(deploymentCfgFile)

 if (dc.parseFile() != 0):

@@ -2176,24 +2190,27 @@ errorCode = genAppDeploymentFileBin(dList, loadImageFs2)
 # Generate Filesystem Image

 loadImageFs2.genFsImage(LoadImageName)

 

+# Write out file offsets in the file systems

+loadImageFs2.dumpFileoffsets(fsOffsetsFileName)

+

 if errorCode != None:

         sys.exit(-10)   

         

 # Debug Dumps

 # Print Partition List

-for p in pList:

-        p.dump()

+#for p in pList:

+#       p.dump()

 

 # Print Application List

-for a in aList:

-        a.dump()        

+#for a in aList:

+#       a.dump()        

 

 # Print Library List

-print 'Printing globalLibList:'

-for lib in globalLibList:

-        globalLibList[lib].dump()

+#print 'Printing globalLibList:'

+#for lib in globalLibList:

+#       globalLibList[lib].dump()

         

 # Print FileSystem Info 

-print 'Print Filesystem Information:'

+#print 'Print Filesystem Information:'

 #loadImageFs.dump()

-loadImageFs2.dump()
\ No newline at end of file
+#loadImageFs2.dump()
\ No newline at end of file