rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generate_memory_usage_report/gcc_map_reader BUG? fix #721

This commit is contained in:
rusefi 2019-03-30 10:42:01 -04:00
parent f1bb43abb5
commit d973ebaa1c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/gcc_map_reader.jar
View File

Binary file not shown.

BIN
java_tools/gcc_map_reader/lib/junit.jar Normal file
View File

Binary file not shown.

6
java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
View File

@ -54,7 +54,7 @@ public class GccMapReader {
String line = lines.get(i); String line = lines.get(i);
if (!line.contains(".bss.")) if (!line.contains(".bss."))
continue; continue;
debug(line); debug("Got: " + line);
Matcher m1 = SINGLE_LINE_PATTERN.matcher(line); Matcher m1 = SINGLE_LINE_PATTERN.matcher(line);
@ -75,8 +75,8 @@ public class GccMapReader {
Matcher m2 = MULTI_LINE_PATTERN.matcher(line); Matcher m2 = MULTI_LINE_PATTERN.matcher(line);
if (!m2.matches()) { if (!m2.matches()) {
debug("Skipping " + line); debug("Returning into consideration: " + line);
return lineIndex; return lineIndex - 1;
} }
String sizeString = m2.group(1); String sizeString = m2.group(1);

5
java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java
View File

@ -53,7 +53,8 @@ public class GccMapReaderTest {
" .bss.ch 0x1fff9320 0x80 build_kinetis/obj/chschd.o", " .bss.ch 0x1fff9320 0x80 build_kinetis/obj/chschd.o",
" 0x1fff9320 ch")); " 0x1fff9320 ch"));
assertNotNull(r); assertNotNull(r);
assertEquals(1, r.size()); assertEquals(2, r.size());
assertEquals(0x80, r.get(0).getSize()); assertEquals(0x610, r.get(0).getSize());
assertEquals(0x80, r.get(1).getSize());
} }
} }