Replace system headers with C++ equivalent

Update to cpp headers (formatted) Use c++ headers in c++ files Reverts change Rework on clean copies from main
cpc · Dec 20, 2022 · a0b8a6f · a0b8a6f
1 parent b364ff6
commit a0b8a6f
Show file tree

Hide file tree

Showing 29 changed files with 259 additions and 247 deletions.
diff --git a/openasip/bclib/saocl/oclhostsa.cc b/openasip/bclib/saocl/oclhostsa.cc
@@ -32,10 +32,11 @@
 
 #define __STDC_LIMIT_MACROS
 
+#include <cassert>
+#include <climits>
+#include <cstdlib>
+
 #include "opencl_types.hh"
-#include <assert.h>
-#include <stdlib.h>
-#include <limits.h>
 
 //#define DEBUG_OCL_HOST
 
@@ -44,7 +45,9 @@
 #endif
 
 #include <CL/cl.h>
-#include <string.h>
+
+#include <cstring>
+
 #include "cl_tce.h"
 
 #define DUMMY_PLATFORM_ID 42

diff --git a/openasip/icdecoder_plugins/DefaultICDecoderPlugin.cc b/openasip/icdecoder_plugins/DefaultICDecoderPlugin.cc
@@ -31,79 +31,72 @@
  * @note rating: red
  */
 
-#include <string>
-#include <vector>
-#include <set>
 #include <algorithm>
-#include <utility>
-#include <iterator>
+#include <cmath>
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <map>
-#include <math.h>
-
-#include "boost/regex.hpp"
-#include "boost/format.hpp"
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "HDBManager.hh"
-#include "HDBRegistry.hh"
-#include "Machine.hh"
-#include "MachineInfo.hh"
-#include "Socket.hh"
+#include "Application.hh"
+#include "BinaryEncoding.hh"
+#include "BlockSourceCopier.hh"
 #include "Bus.hh"
-#include "Segment.hh"
+#include "CUOpcodeGenerator.hh"
 #include "ControlUnit.hh"
-#include "Guard.hh"
+#include "Conversion.hh"
+#include "DataObject.hh"
+#include "DefaultDecoderGenerator.hh"
+#include "DefaultICGenerator.hh"
+#include "DestinationField.hh"
+#include "Environment.hh"
+#include "ExecutionTrace.hh"
+#include "FUGuardEncoding.hh"
 #include "FUPort.hh"
-#include "RFPort.hh"
-#include "MachineImplementation.hh"
+#include "FUPortCode.hh"
+#include "GPRGuardEncoding.hh"
+#include "Guard.hh"
+#include "GuardEncoding.hh"
+#include "GuardField.hh"
+#include "HDBManager.hh"
+#include "HDBRegistry.hh"
 #include "ICDecoderEstimatorPlugin.hh"
-#include "Program.hh"
-#include "ExecutionTrace.hh"
-
 #include "ICDecoderGeneratorPlugin.hh"
-#include "ProGeTypes.hh"
-#include "NetlistBlock.hh"
+#include "IUPortCode.hh"
+#include "ImmediateControlField.hh"
+#include "ImmediateSlotField.hh"
+#include "LImmDstRegisterField.hh"
 #include "LoopBufferBlock.hh"
-#include "NetlistGenerator.hh"
+#include "Machine.hh"
+#include "MachineImplementation.hh"
+#include "MachineInfo.hh"
+#include "MapTools.hh"
+#include "MathTools.hh"
+#include "MoveSlot.hh"
 #include "Netlist.hh"
+#include "NetlistBlock.hh"
+#include "NetlistGenerator.hh"
 #include "NetlistPort.hh"
-#include "VHDLNetlistWriter.hh"
-#include "VerilogNetlistWriter.hh"
-#include "CUOpcodeGenerator.hh"
+#include "ProGeTypes.hh"
+#include "Program.hh"
+#include "RFPort.hh"
+#include "RFPortCode.hh"
+#include "RV32MicroCodeGenerator.hh"
+#include "Segment.hh"
 #include "SignalTypes.hh"
-
-#include "DefaultDecoderGenerator.hh"
-#include "DefaultICGenerator.hh"
-
-#include "BinaryEncoding.hh"
-#include "MoveSlot.hh"
+#include "Socket.hh"
+#include "SocketCodeTable.hh"
+#include "SocketEncoding.hh"
 #include "SourceField.hh"
-#include "DestinationField.hh"
-#include "GuardField.hh"
-#include "ImmediateSlotField.hh"
-#include "ImmediateControlField.hh"
-#include "LImmDstRegisterField.hh"
-#include "GuardEncoding.hh"
-#include "GPRGuardEncoding.hh"
-#include "FUGuardEncoding.hh"
 #include "UnconditionalGuardEncoding.hh"
-#include "SocketEncoding.hh"
-#include "RFPortCode.hh"
-#include "IUPortCode.hh"
-#include "FUPortCode.hh"
-#include "SocketCodeTable.hh"
-#include "BlockSourceCopier.hh"
-
-#include "Application.hh"
-#include "MathTools.hh"
-#include "DataObject.hh"
-#include "MapTools.hh"
-#include "Conversion.hh"
-#include "Environment.hh"
-#include "RV32MicroCodeGenerator.hh"
-
-#include "CUOpcodeGenerator.hh"
+#include "VHDLNetlistWriter.hh"
+#include "VerilogNetlistWriter.hh"
+#include "boost/format.hpp"
+#include "boost/regex.hpp"
 
 using namespace CostEstimator;
 using std::cerr;

diff --git a/openasip/opset/base/base.cc b/openasip/opset/base/base.cc
@@ -31,16 +31,18 @@
  * @author Pekka Jääskeläinen 2005-2014 (pekka.jaaskelainen-no.spam-tut.fi)
  */
 
-#include <iostream>
+#include <cmath> // isnan()
 #include <fstream>
-#include <math.h> // isnan()
+#include <iostream>
 
 #include "OSAL.hh"
 #include "TCEString.hh"
 #include "OperationGlobals.hh"
 #include "Application.hh"
 #include "Conversion.hh"
 
+using namespace std;
+
 #define RUNTIME_ERROR_WITH_INT(MESSAGE, DATA) {\
        int len = strlen(MESSAGE) + 15;                \
        char *tmpBuf = static_cast<char*>(alloca(len));\

diff --git a/openasip/opset/base/double.cc b/openasip/opset/base/double.cc
@@ -31,16 +31,18 @@
  * @author Pekka Jääskeläinen 2005-2014 (pekka.jaaskelainen-no.spam-tut.fi)
  */
 
-#include <iostream>
+#include <cmath> // std::isnan()
 #include <fstream>
-#include <math.h> // isnan()
+#include <iostream>
 
 #include "OSAL.hh"
 #include "TCEString.hh"
 #include "OperationGlobals.hh"
 #include "Application.hh"
 #include "Conversion.hh"
 
+using namespace std;
+
 #define RUNTIME_ERROR_WITH_INT(MESSAGE, DATA) {\
        int len = strlen(MESSAGE) + 15;                \
        char *tmpBuf = static_cast<char*>(alloca(len));\

diff --git a/openasip/src/applibs/ImplementationTester/FUTestbenchGenerator.cc b/openasip/src/applibs/ImplementationTester/FUTestbenchGenerator.cc
@@ -31,30 +31,32 @@
  * @note rating: red
  */
 
-#include <string>
-#include <sstream>
-#include <vector>
-#include <boost/random.hpp>
+#include "FUTestbenchGenerator.hh"
+
 #include <boost/nondet_random.hpp>
+#include <boost/random.hpp>
+#include <cstdint>
 #include <ctime>
-#include <stdint.h>
-#include "HDBManager.hh"
-#include "FUEntry.hh"
-#include "TestbenchGenerator.hh"
-#include "FUTestbenchGenerator.hh"
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Conversion.hh"
 #include "FUArchitecture.hh"
+#include "FUEntry.hh"
+#include "FUImplementation.hh"
+#include "FUPortImplementation.hh"
 #include "FunctionUnit.hh"
+#include "HDBManager.hh"
+#include "HWOperation.hh"
+#include "InputPortState.hh"
 #include "Machine.hh"
 #include "MachineState.hh"
 #include "MachineStateBuilder.hh"
 #include "MemorySystem.hh"
 #include "OutputPortState.hh"
-#include "InputPortState.hh"
-#include "FUPortImplementation.hh"
-#include "FUImplementation.hh"
-#include "HWOperation.hh"
 #include "StringTools.hh"
-#include "Conversion.hh"
+#include "TestbenchGenerator.hh"
 
 using std::string;
 using std::vector;

diff --git a/openasip/src/applibs/ImplementationTester/ImplementationTester.cc b/openasip/src/applibs/ImplementationTester/ImplementationTester.cc
@@ -30,39 +30,38 @@
  * @author Otto Esko 2010 (otto.esko-no.spam-tut.fi)
  * @note rating: red
  */
-#include <iostream>
+#include "ImplementationTester.hh"
+
+#include <cstdint>
 #include <cstdlib>
-#include <iostream>
 #include <fstream>
-#include <string>
+#include <iostream>
+#include <map>
 #include <sstream>
-#include <fstream>
+#include <string>
 #include <vector>
-#include <map>
-#include <stdint.h>
 
-#include "ImplementationTester.hh"
-#include "HDBManager.hh"
 #include "CachedHDBManager.hh"
-#include "FUEntry.hh"
 #include "FUArchitecture.hh"
+#include "FUEntry.hh"
 #include "FUImplementation.hh"
-#include "RFEntry.hh"
-#include "RFArchitecture.hh"
-#include "RFImplementation.hh"
+#include "FUTestbenchGenerator.hh"
 #include "FunctionUnit.hh"
+#include "GhdlSimulator.hh"
+#include "HDBManager.hh"
+#include "HWBlockImplementation.hh"
+#include "ImplementationSimulator.hh"
+#include "InputPortState.hh"
 #include "Machine.hh"
 #include "MachineState.hh"
 #include "MachineStateBuilder.hh"
 #include "MemorySystem.hh"
+#include "ModelsimSimulator.hh"
 #include "OutputPortState.hh"
-#include "InputPortState.hh"
-#include "FUTestbenchGenerator.hh"
+#include "RFArchitecture.hh"
+#include "RFEntry.hh"
+#include "RFImplementation.hh"
 #include "RFTestbenchGenerator.hh"
-#include "ImplementationSimulator.hh"
-#include "GhdlSimulator.hh"
-#include "ModelsimSimulator.hh"
-#include "HWBlockImplementation.hh"
 
 using std::string;
 using std::vector;

diff --git a/openasip/src/applibs/ImplementationTester/RFTestbenchGenerator.cc b/openasip/src/applibs/ImplementationTester/RFTestbenchGenerator.cc
@@ -30,26 +30,28 @@
  * @note rating: red
  */
 
-#include <string>
-#include <sstream>
-#include <vector>
-#include <boost/random.hpp>
+#include "RFTestbenchGenerator.hh"
+
 #include <boost/nondet_random.hpp>
+#include <boost/random.hpp>
+#include <cstdint>
 #include <ctime>
-#include <stdint.h>
+#include <sstream>
+#include <string>
+#include <vector>
+
 #include "HDBManager.hh"
-#include "RFEntry.hh"
-#include "TestbenchGenerator.hh"
-#include "RFTestbenchGenerator.hh"
-#include "RFArchitecture.hh"
 #include "Machine.hh"
 #include "MachineState.hh"
 #include "MachineStateBuilder.hh"
+#include "MathTools.hh"
 #include "MemorySystem.hh"
-#include "RegisterFileState.hh"
-#include "RFPortImplementation.hh"
+#include "RFArchitecture.hh"
+#include "RFEntry.hh"
 #include "RFImplementation.hh"
-#include "MathTools.hh"
+#include "RFPortImplementation.hh"
+#include "RegisterFileState.hh"
+#include "TestbenchGenerator.hh"
 
 using std::string;
 using std::vector;

diff --git a/openasip/src/applibs/ImplementationTester/TestbenchGenerator.cc b/openasip/src/applibs/ImplementationTester/TestbenchGenerator.cc
@@ -30,19 +30,21 @@
  * @note rating: red
  */
 
-#include <string>
-#include <sstream>
+#include "TestbenchGenerator.hh"
+
+#include <boost/format.hpp>
+#include <cstdint>
 #include <fstream>
-#include <vector>
 #include <map>
-#include <stdint.h>
-#include <boost/format.hpp>
-#include "TestbenchGenerator.hh"
-#include "StringTools.hh"
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Conversion.hh"
 #include "Environment.hh"
 #include "FileSystem.hh"
-#include "Conversion.hh"
 #include "HWBlockImplementation.hh"
+#include "StringTools.hh"
 
 using std::string;
 using std::vector;