Merge pull request #33 from DavidSM64/davids-branch

Updated score.sh to be based on code size.

tools/python/score.py

@@ -5,11 +5,38 @@ SRC_DIRECTORY = './src'
 FUNCTION_REGEX = r'([/][*]([^*]|([*][^/]))*[*][/][\n]\s*)?(void|s64|s32|s16|s8|u64|u32|u16|u8|f32|f64)(\s|[*])*([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{'
 WIP_REGEX = r'#if(.|\n)*?(GLOBAL_ASM[(][^)]*[)])(.|\n)*?#else(.|\n)*?#endif'
 
+CODE_START = 0x80000400
+CODE_END = 0x800D75F4
+CODE_SIZE = CODE_END - CODE_START
+
+class DkrMapFile:
+    def __init__(self):
+        with open('./build/dkr.map', 'r') as mapFile:
+            self.functionSizes = {}
+            functions = []
+            lines = mapFile.read().split('\n')
+            for line in lines:
+                if line.startswith('                0x00000000'):
+                    if '=' in line:
+                        line = line[0:line.find('=')-1]
+                    address = int(line[26:26+8], 16)
+                    if address >= CODE_START and address < CODE_END:
+                        symbol = line[line.rfind(' ')+1:]
+                        functions.append((symbol, address))
+            functions.sort(key=lambda x:x[1]) # Sort by RAM address
+            for i in range(0, len(functions) - 1):
+                self.functionSizes[functions[i][0]] = functions[i + 1][1] - functions[i][1]
+            self.functionSizes[functions[len(functions) - 1][0]] = CODE_END - 0x800D7570 
+            self.numFunctions = len(functions)
+
+MAP_FILE = DkrMapFile()
+
 class ScoreFileMatch:
     def __init__(self, comment, functionName):
         self.comment = comment
         self.functionName = functionName
         self.isDocumented = (comment != None) and not functionName.startswith("func_")
+        self.size = MAP_FILE.functionSizes[functionName]
     
 class ScoreFile:
     def __init__(self, filepath):
@@ -38,6 +65,19 @@ class ScoreFile:
             if func.isDocumented:
                 count += 1
         return count
+        
+    def get_size_of_functions(self):
+        size = 0
+        for func in self.functions:
+            size += func.size
+        return size
+        
+    def get_size_of_documented_functions(self):
+        size = 0
+        for func in self.functions:
+            if func.isDocumented:
+                size += func.size
+        return size
 
 def main():
     scoreFiles = []
@@ -45,16 +85,20 @@ def main():
     totalNumberOfDecompiledFunctions = 0
     totalNumberOfDocumentedFunctions = 0
     totalNumberOfGlobalAsms = 0
+    totalSizeOfDecompiledFunctions = 0
+    totalSizeOfDocumentedFunctions = 0
     for filename in srcFilenames:
         scoreFile = ScoreFile(SRC_DIRECTORY + '/' + filename)
         totalNumberOfDecompiledFunctions += len(scoreFile.functions)
         totalNumberOfGlobalAsms += scoreFile.numGlobalAsms
         totalNumberOfDocumentedFunctions += scoreFile.get_number_of_documented_functions()
+        totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions()
+        totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions()
         scoreFiles.append(scoreFile)
-    totalNumberOfFunctions = totalNumberOfDecompiledFunctions + totalNumberOfGlobalAsms
+    totalNumberOfFunctions = MAP_FILE.numFunctions
     
-    adventureOnePercentage = (totalNumberOfDecompiledFunctions / totalNumberOfFunctions) * 100
-    adventureTwoPercentage = (totalNumberOfDocumentedFunctions / totalNumberOfFunctions) * 100
+    adventureOnePercentage = (totalSizeOfDecompiledFunctions / CODE_SIZE) * 100
+    adventureTwoPercentage = (totalSizeOfDocumentedFunctions / CODE_SIZE) * 100
     
     print('=========================================')
     print(' ADVENTURE ONE (ASM -> C Decompilation)')