Convert flang2 to a C++ project

Author: gklimowicz

include/flang/Error/pgerror.h

@@ -24,7 +24,9 @@
 
 #include "universal.h"
 
+#ifndef IN_FLANG2
 BEGIN_DECL_WITH_C_LINKAGE
+#endif
 
 /** \brief Severity of an error message.
  */
@@ -37,10 +39,18 @@ typedef enum error_severity {
   ERR_SEVERITY_SIZE  // must be last!
 } error_severity;
 
+#ifdef IN_FLANG2
+#include "errmsgdf.h"
+#endif
+
 /** \brief Error code type
  */
 typedef enum error_code error_code_t;
 
+#ifdef IN_FLANG2
+#include "error.h"
+#endif
+
 #ifdef FE90
 void errWithSrc(error_code_t ecode, enum error_severity sev, int eline,
                 const char *op1, const char *op2, int col, int deduceCol,
@@ -82,6 +92,8 @@ void dassert_err(const char *, int line, const char *exp, const char *txt);
 void asrt_failed(const char* file, int line);
 #endif
 
+#ifndef IN_FLANG2
 END_DECL_WITH_C_LINKAGE
+#endif
 
 #endif /* PGERROR_H_ */

lib/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+# Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+set(LIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
 add_subdirectory(ADT)
 add_subdirectory(ArgParser)
 add_subdirectory(scutil)

tools/flang1/flang1exe/symacc.c

@@ -54,13 +54,15 @@ sym_init_first(void)
 
   if (stb.stg_base == NULL) {
     STG_ALLOC(stb, 1000);
-    assert(stb.stg_base, "sym_init: no room for symtab", stb.stg_size, ERR_Fatal);
+    assert(stb.stg_base, "sym_init: no room for symtab", stb.stg_size,
+           ERR_Fatal);
     stb.n_size = 5024;
     NEW(stb.n_base, char, stb.n_size);
     assert(stb.n_base, "sym_init: no room for namtab", stb.n_size, ERR_Fatal);
     stb.n_base[0] = 0;
     STG_ALLOC(stb.dt, 400);
-    assert(stb.dt.stg_base, "sym_init: no room for dtypes", stb.dt.stg_size, ERR_Fatal);
+    assert(stb.dt.stg_base, "sym_init: no room for dtypes", stb.dt.stg_size,
+           ERR_Fatal);
     /* basically, this is sidecar of dt_base */
 
     stb.w_size = 32;
@@ -98,7 +100,8 @@ realloc_sym_storage()
   DEBUG_ASSERT(stb.stg_size > 0,
                "realloc_sym_storage: symbol storage not initialized?");
   STG_NEED(stb);
-  DEBUG_ASSERT(stb.stg_avail <= stb.stg_size, "realloc_sym_storage: internal error");
+  DEBUG_ASSERT(stb.stg_avail <= stb.stg_size,
+               "realloc_sym_storage: internal error");
 }
 
 /**
@@ -112,8 +115,8 @@ SPTR
 lookupsym(const char *name, int olength)
 {
   int length;
-  SPTR sptr;     /* pointer to symbol table entry */
-  INT hashval;   /* index into hashtb. */
+  SPTR sptr;   /* pointer to symbol table entry */
+  INT hashval; /* index into hashtb. */
 
   /*
    * Loop thru the appropriate hash link list to see if symbol is
@@ -208,8 +211,8 @@ SPTR
 installsym_ex(const char *name, int olength, IS_MODE mode)
 {
   int length;
-  SPTR sptr;     /* pointer to symbol table entry */
-  INT hashval;   /* index into hashtb. */
+  SPTR sptr;   /* pointer to symbol table entry */
+  INT hashval; /* index into hashtb. */
   bool toolong;
   int nmptr;
   static int max_idlen = MAXIDLEN;
@@ -464,15 +467,13 @@ is_cimag_flt0(SPTR sptr)
 bool
 is_cmplx_dbl0(SPTR sptr)
 {
-  return is_dbl0((SPTR)CONVAL1G(sptr)) && // ???
-    is_dbl0((SPTR)CONVAL2G(sptr)); // ???
+  return is_dbl0(SymConval1(sptr)) && is_dbl0(SymConval2(sptr));
 }
 
 bool
 is_cmplx_quad0(SPTR sptr)
 {
-  return is_quad0((SPTR)CONVAL1G(sptr)) && // ???
-    is_quad0((SPTR)CONVAL2G(sptr)); // ???
+  return is_quad0(SymConval1(sptr)) && is_quad0(SymConval2(sptr));
 }
 
 void

tools/flang1/flang1exe/symacc.h

@@ -240,11 +240,15 @@ typedef struct {
 extern STB stb;
 
 #ifdef __cplusplus
-inline SPTR SymConv1(SPTR sptr) {
+inline SPTR SymConval1(SPTR sptr) {
   return static_cast<SPTR>(CONVAL1G(sptr));
 }
+inline SPTR SymConval2(SPTR sptr) {
+  return static_cast<SPTR>(CONVAL2G(sptr));
+}
 #else
-#define SymConv1 CONVAL1G
+#define SymConval1 CONVAL1G
+#define SymConval2 CONVAL2G
 #endif
 
 /** mode parameter for installsym_ex. */

tools/flang2/flang2exe/CMakeLists.txt

@@ -16,83 +16,79 @@
 
 if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
   set(ARCH_DEP_FILES
-    x86_64-Linux/ll_abi.c
+    x86_64-Linux/ll_abi.cpp
   )
 elseif( ${TARGET_ARCHITECTURE} STREQUAL "aarch64" )
   set(ARCH_DEP_FILES
-      aarch64-Linux/ll_abi.c
+      aarch64-Linux/ll_abi.cpp
   )
 elseif( ${TARGET_ARCHITECTURE} STREQUAL "ppc64le" )
   set(ARCH_DEP_FILES
-    ppc64le-Linux/ll_abi.c
+    ppc64le-Linux/ll_abi.cpp
   )
 endif()
 
-
 set(SOURCES
   ${ARCH_DEP_FILES}
-  bihutil.c
-  dinitutl.c
-  dinit.c
-  dtypeutl.c
-  fenddf.c
-  ilmutil.c
-  listing.c
-  mwd.c
-  semsym.c
-  semutil0.c
-  symtab.c
-  symacc.c
-  upper.c
-  xref.c
-  expreg.c
-  exputil.c
-  regutil.c
-  expdf.c
-  ili-rewrite.c
-  ilidf.c
-  iliutil.c
-  iltutil.c
-  expand.c
-  expatomics.c
-  expsmp.c
-  exp_ftn.c
-  exp_fvec.c
-  exp_rte.c
-  outliner.c
-  rmsmove.c
-  scope.c
-  rbtree.c
-  ll_dbgutl.c
-  dwarf_names.c
-  llassem.c
-  llassem_common.c
-  asm_anno.c
-  main.c
-  version.c
-  cgmain.c
-  fastset.c
-  lldebug.c
-  llutil.c
-  ll_ftn.c
-  ll_structure.c
-  ll_write.c
-  ll_builder.c
-  llopt.c
-  llsched.c
-  machreg.c
-  kmpcutil.c
-  verify.c
+  bihutil.cpp
+  dinitutl.cpp
+  dinit.cpp
+  dtypeutl.cpp
+  fenddf.cpp
+  ilmutil.cpp
+  listing.cpp
+  mwd.cpp
+  semsym.cpp
+  semutil0.cpp
+  symtab.cpp
+  symacc.cpp
+  upper.cpp
+  xref.cpp
+  expreg.cpp
+  exputil.cpp
+  regutil.cpp
+  expdf.cpp
+  ili-rewrite.cpp
+  ilidf.cpp
+  iliutil.cpp
+  iltutil.cpp
+  expand.cpp
+  expatomics.cpp
+  expsmp.cpp
+  exp_ftn.cpp
+  exp_fvec.cpp
+  exp_rte.cpp
+  outliner.cpp
+  rmsmove.cpp
+  scope.cpp
+  rbtree.cpp
+  ll_dbgutl.cpp
+  dwarf_names.cpp
+  llassem.cpp
+  llassem_common.cpp
+  asm_anno.cpp
+  main.cpp
+  version.cpp
+  cgmain.cpp
+  fastset.cpp
+  lldebug.cpp
+  llutil.cpp
+  ll_ftn.cpp
+  ll_structure.cpp
+  ll_write.cpp
+  ll_builder.cpp
+  llopt.cpp
+  llsched.cpp
+  machreg.cpp
+  kmpcutil.cpp
+  verify.cpp
   kmpcutil.h
   )
 
 set(COMMON_DEFS
   MMD
   NOVECTORIZE
-  )
-
-set(COMPILE_OPTS
-  -std=c11
+  IN_FLANG2
   )
 
 set(INCLUDE_DIRS
@@ -110,8 +106,25 @@ set(INCLUDE_DIRS
   ${UTILS_SHARED_DIR}
   )
 
+set(SHARED_SOURCES
+  ${SHARED_SOURCES}
+  ${LIB_SOURCE_DIR}/ADT/hash.c
+  ${LIB_SOURCE_DIR}/ArgParser/arg_parser.c
+  ${LIB_SOURCE_DIR}/ArgParser/debug_action.c
+  ${LIB_SOURCE_DIR}/ArgParser/xflag.c
+  )
+
+
+foreach(FILE ${SHARED_SOURCES})
+  get_filename_component(TOFILE ${FILE} NAME)
+  add_custom_command(OUTPUT ${TOFILE}pp 
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${FILE} ${TOFILE}pp
+    MAIN_DEPENDENCY ${FILE})
+  set(SHARED_CPP_SOURCES ${SHARED_CPP_SOURCES} ${TOFILE}pp)
+endforeach()
+
 add_flang_executable(flang2
-  ${SOURCES} ${SHARED_SOURCES}
+  ${SOURCES} ${SHARED_CPP_SOURCES}
   )
 
 target_compile_definitions(flang2

…/flang2/flang2exe/aarch64-Linux/ll_abi.c …lang2/flang2exe/aarch64-Linux/ll_abi.cpptools/flang2/flang2exe/aarch64-Linux/ll_abi.c renamed to tools/flang2/flang2exe/aarch64-Linux/ll_abi.cpp tools/flang2/flang2exe/aarch64-Linux/ll_abi.c renamed to tools/flang2/flang2exe/aarch64-Linux/ll_abi.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 #include "symtab.h"
 #include "llutil.h"
 #include "ll_structure.h"
+#include "dtypeutl.h"
 
 #define DT_VOIDNONE DT_NONE
 
@@ -59,7 +60,7 @@ update_homogeneous(void *context, DTYPE dtype, unsigned address,
   dtype = DT_BASETYPE(dtype);
 
   if (DTY(dtype) == TY_ARRAY)
-    dtype = DTY(dtype + 1);
+    dtype = (DTYPE)DTY(dtype + 1); // ???
 
   switch (dtype) {
   case DT_CMPLX: