Remove app_common and all references to it

- Removed the includes of app_common.h - Removed app_common references in build infrastructure - Removed app_common.cc and app_common.h
2025-06-11 04:02:42 +08:00 · 2021-07-28 16:14:26 -04:00 · 2021-07-28 16:14:26 -04:00 · a08a5644c4
commit a08a5644c4
parent d607f42d04
21 changed files with 2 additions and 91 deletions
--- a/tester/covoar/CoverageReaderQEMU.cc
+++ b/tester/covoar/CoverageReaderQEMU.cc
@ -14,7 +14,6 @@

 #include <rld.h>

-#include "app_common.h"
 #include "CoverageReaderQEMU.h"
 #include "CoverageMap.h"
 #include "ExecutableInfo.h"
--- a/tester/covoar/CoverageReaderTSIM.cc
+++ b/tester/covoar/CoverageReaderTSIM.cc
@ -14,7 +14,6 @@

 #include <rld.h>

-#include "app_common.h"
 #include "CoverageReaderTSIM.h"
 #include "CoverageMap.h"
 #include "ExecutableInfo.h"
--- a/tester/covoar/DesiredSymbols.cc
+++ b/tester/covoar/DesiredSymbols.cc
@ -23,7 +23,6 @@
 #include "rld-files.h"

 #include "DesiredSymbols.h"
-#include "app_common.h"
 #include "CoverageMap.h"

 namespace Coverage {
--- a/tester/covoar/ExecutableInfo.cc
+++ b/tester/covoar/ExecutableInfo.cc
@ -11,7 +11,6 @@

 #include "ExecutableInfo.h"
 #include "ObjdumpProcessor.h"
-#include "app_common.h"
 #include "CoverageMap.h"
 #include "SymbolTable.h"

--- a/tester/covoar/Explanations.cc
+++ b/tester/covoar/Explanations.cc
@ -15,7 +15,6 @@
 #include <rld.h>

 #include "Explanations.h"
-#include "app_common.h"

 namespace Coverage {

--- a/tester/covoar/GcovFunctionData.cc
+++ b/tester/covoar/GcovFunctionData.cc
@ -9,7 +9,6 @@
 #include <cstring>
 #include <cinttypes>

-#include "app_common.h"
 #include "GcovFunctionData.h"
 #include "ObjdumpProcessor.h"
 #include "CoverageMapBase.h"
--- a/tester/covoar/Makefile
+++ b/tester/covoar/Makefile
@ -2,8 +2,7 @@ INSTALL_DIR=../bin
 CXXFLAGS=-g -Wall -O3
 PROGRAMS=covoar qemu-dump-trace trace-converter configfile-test

-COMMON_OBJS= app_common.o \
-  ConfigFile.o \
+COMMON_OBJS= ConfigFile.o \
  CoverageFactory.o \
  CoverageMap.o \
  CoverageMapBase.o \
@ -90,9 +89,6 @@ trace-converter: $(TRACECONVERTER_OBJS)
 configfile-test: $(CONFIGFILE_TEST_OBJS)
 	$(CXX) $(CXXFLAGS) -o $(@) $(CONFIGFILE_TEST_OBJS)

-#  DEPENDENCIES ON SINGLE OBJECTS
-app_common.o: app_common.h app_common.cc
-
 covoar.o: covoar.cc CoverageFactory.h CoverageMap.h DesiredSymbols.h \
  ExecutableInfo.h Explanations.h ObjdumpProcessor.h ReportsBase.h

--- a/tester/covoar/ObjdumpProcessor.cc
+++ b/tester/covoar/ObjdumpProcessor.cc
@ -14,7 +14,6 @@
 #include <algorithm>
 #include <string>

-#include "app_common.h"
 #include "ObjdumpProcessor.h"
 #include "CoverageMap.h"
 #include "ExecutableInfo.h"
--- a/tester/covoar/ReportsBase.cc
+++ b/tester/covoar/ReportsBase.cc
@ -8,7 +8,6 @@
 #include <sstream>

 #include "ReportsBase.h"
-#include "app_common.h"
 #include "CoverageRanges.h"
 #include "DesiredSymbols.h"
 #include "Explanations.h"
--- a/tester/covoar/ReportsHtml.cc
+++ b/tester/covoar/ReportsHtml.cc
@ -9,7 +9,6 @@
 #include <rtems-utils.h>

 #include "ReportsHtml.h"
-#include "app_common.h"
 #include "CoverageRanges.h"
 #include "DesiredSymbols.h"
 #include "ObjdumpProcessor.h"
--- a/tester/covoar/ReportsText.cc
+++ b/tester/covoar/ReportsText.cc
@ -4,7 +4,6 @@
 #include <iomanip>

 #include "ReportsText.h"
-#include "app_common.h"
 #include "CoverageRanges.h"
 #include "DesiredSymbols.h"
 #include "Explanations.h"
--- a/tester/covoar/SymbolTable.cc
+++ b/tester/covoar/SymbolTable.cc
@ -13,7 +13,6 @@
 #include <rld.h>

 #include "SymbolTable.h"
-#include "app_common.h"

 namespace Coverage {

--- a/tester/covoar/TraceConverter.cc
+++ b/tester/covoar/TraceConverter.cc
@ -21,7 +21,6 @@
 #include "TraceWriterQEMU.h"
 #include "TraceList.h"
 #include "ObjdumpProcessor.h"
-#include "app_common.h"
 #include "TargetFactory.h"

 #if defined(_WIN32) || defined(__CYGWIN__)
--- a/tester/covoar/TraceReaderLogQEMU.cc
+++ b/tester/covoar/TraceReaderLogQEMU.cc
@ -41,7 +41,6 @@
 #include <string.h>

 #include "qemu-log.h"
-#include "app_common.h"
 #include "TraceReaderBase.h"
 #include "TraceReaderLogQEMU.h"
 #include "TraceList.h"
--- a/tester/covoar/TraceWriterQEMU.cc
+++ b/tester/covoar/TraceWriterQEMU.cc
@ -42,7 +42,6 @@

 #include <rld-process.h>

-#include "app_common.h"
 #include "TraceWriterQEMU.h"
 #include "ExecutableInfo.h"
 #include "CoverageMap.h"
--- a/tester/covoar/app_common.cc
+++ b/tester/covoar/app_common.cc
@ -1,49 +0,0 @@
-/*
- * RTEMS Tools Project (http://www.rtems.org/)
- * Copyright 2014 OAR Corporation
- * All rights reserved.
- *
- * This file is part of the RTEMS Tools package in 'rtems-tools'.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "covoar-config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "app_common.h"
-#include "DesiredSymbols.h"
-#include "Explanations.h"
-/*
- *  Global variables for the program
- */
-
-
-
-
--- a/tester/covoar/app_common.h
+++ b/tester/covoar/app_common.h
@ -1,18 +0,0 @@
-#ifndef __APP_COMMON_h
-#define __APP_COMMON_h
-
-/*
- * This file needs to be removed and these globals removed from the
- * global scope. For example SymbolsToAnalyze is never destructed.
- */
-
-#include <list>
-
-#include "DesiredSymbols.h"
-#include "Explanations.h"
-#include "TargetBase.h"
-
-
-
-
-#endif
--- a/tester/covoar/coverage_converter.cc
+++ b/tester/covoar/coverage_converter.cc
@ -11,7 +11,6 @@
 #include <sys/stat.h>
 #include <unistd.h>

-#include "app_common.h"
 #include "CoverageFactory.h"
 #include "CoverageMap.h"

--- a/tester/covoar/covmerge.cc
+++ b/tester/covoar/covmerge.cc
@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <errno.h>

-#include "app_common.h"
 #include "CoverageFactory.h"
 #include "CoverageMap.h"
 #include "CoverageRanges.h"
--- a/tester/covoar/covoar.cc
+++ b/tester/covoar/covoar.cc
@ -19,7 +19,6 @@
 #include <rld.h>
 #include <rld-process.h>

-#include "app_common.h"
 #include "CoverageFactory.h"
 #include "CoverageMap.h"
 #include "DesiredSymbols.h"
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@ -82,8 +82,7 @@ def build(bld):
    modules = ['rld', 'dwarf', 'elf', 'iberty']

    bld.stlib(target = 'ccovoar',
-              source = ['app_common.cc',
-                        'AddressToLineMapper.cc',
+              source = ['AddressToLineMapper.cc',
                        'CoverageFactory.cc',
                        'CoverageMap.cc',
                        'CoverageMapBase.cc',