Clean const-correctness issues with the VERSION data structure

Author: gklimowicz

tools/flang1/flang1exe/version.c

@@ -24,12 +24,12 @@
 
 /* COPYRIGHT is extern to make it easy to find in symbol table */
 /* it also has extra space to patch in interesting stuff */
-char COPYRIGHT[128] =
+const char COPYRIGHT[128] =
     "";
 
 VERSION version = {LANGUAGE, VHOST, VSN, BLD, DVSN, TARGET, PRODUCT, COPYRIGHT};
 
-char *
+const char *
 get_version_string(void)
 {
   static char buf[128];

tools/flang1/flang1exe/version.h

@@ -23,10 +23,10 @@ typedef struct {
   char *dvsn;    /* date-based version number */
   char *target;  /* target compiler */
   char *product; /* product designation */
-  char *copyright;
+  const char *copyright;
 } VERSION;
 
 extern VERSION version;
 
-char *get_version_string(void);
+const char *get_version_string(void);
 

tools/flang2/flang2exe/cgmain.cpp

@@ -3726,7 +3726,7 @@ make_stmt(STMT_Type stmt_type, int ilix, bool deletable, SPTR next_bih_label,
       LL_InstrListFlags store_flags = InstrListFlagsNull;
       LL_Type *int_llt = NULL;
       LL_Type *v4_llt = NULL;
-      msz = (MSZ)ILI_MSZ_OF_ST(ilix); // ???
+      msz = ILI_MSZ_OF_ST(ilix);
       vect_dtype = ili_get_vect_dtype(ilix);
 #if defined(TARGET_LLVM_ARM)
       if (vect_dtype) {
@@ -7328,7 +7328,7 @@ gen_llvm_cmpxchg(int ilix)
   CMPXCHG_MEMORY_ORDER order;
 
   /* Construct aggregate type for result of cmpxchg. */
-  MSZ msz = (MSZ)atomic_info(ilix).msz; // ???
+  MSZ msz = atomic_info(ilix).msz;
   LL_Module *module = cpu_llvm_module;
   elements[0] = make_type_from_msz(msz);
   elements[1] = ll_create_basic_type(module, LL_I1, 0);
@@ -7876,7 +7876,7 @@ gen_llvm_expr(int ilix, LL_Type *expected_type)
     LL_InstrListFlags flags;
     ld_ili = ILI_OPND(ilix, 1);
     nme_ili = ILI_OPND(ilix, 2);
-    msz = (MSZ)ILI_MSZ_OF_LD(ilix); // ???
+    msz = ILI_MSZ_OF_LD(ilix);
     if (opc == IL_ATOMICLDSP) {
       fromdtype = DT_FLOAT;
       todtype = DT_INT;
@@ -12977,7 +12977,7 @@ insert_entry_label(int ilt)
   INSTR_LIST *Curr_Instr = gen_instr(I_NONE, NULL, NULL, make_label_op(sptr));
   ad_instr(0, Curr_Instr);
   llvm_info.return_ll_type = make_lltype_from_dtype(
-      gbl.arets ? DT_INT : get_return_type(sptr)); // ???: possible bug
+      gbl.arets ? DT_INT : get_return_type(sptr)); // FIXME: possible bug
 }
 
 void

tools/flang2/flang2exe/expand.cpp

@@ -1939,7 +1939,7 @@ exp_mac(ILM_OP opc, ILM *ilmp, int curilm)
   while (ilicnt-- > 0) {
     ilmtpl = (ILMMAC *)&ilmtp[pattern];
 
-    newili.opc = ilmtpl->opc; /* get ili opcode */
+    newili.opc = (ILI_OP) ilmtpl->opc; /* get ili opcode */ // ???
 
     /* Loop for each operand in this ili template */
     for (i = 0, noprs = ilis[newili.opc].oprs; noprs > 0; ++i, --noprs) {

tools/flang2/flang2exe/expsmp.cpp

@@ -44,6 +44,14 @@
 #include "llmputil.h"
 #include "symfun.h"
 
+#ifdef __cplusplus
+inline SPTR GetPARUPLEVEL(SPTR sptr) {
+  return static_cast<SPTR>(PARUPLEVELG(sptr));
+}
+#undef PARUPLEVELG
+#define PARUPLEVELG GetPARUPLEVEL
+#endif
+
 static void incrOutlinedCnt(void);
 static void decrOutlinedCnt(void);
 static int getOutlinedTemp(char *, int);
@@ -144,7 +152,7 @@ typedef struct SectionsWrk_t {
   SPTR lb;  /* start at 0 */
   SPTR ub;  /* number of sections */
   SPTR st;  /* stride 1 */
-  int last; /* flag for last section */
+  SPTR last; /* flag for last section */
   int cnt;  /* running count */
   int bbih; /* start block for sections */
 } SectionsWrk_t;
@@ -809,7 +817,7 @@ setTaskloopVars(SPTR lb, SPTR ub, SPTR stride, SPTR lastitr)
   /* This code is in an outlined taskloop routine.
    * Load taskloop vars from arg1 to local/private vars.
    */
-  arg = (SPTR)ll_get_hostprog_arg(GBL_CURRFUNC, 2); // ???
+  arg = ll_get_hostprog_arg(GBL_CURRFUNC, 2);
   basenm = addnme(NT_VAR, arg, 0, 0);
   baseili = ad_acon(arg, 0);
   baseili = mk_address(arg);
@@ -943,7 +951,7 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
   LLTask *task;
   bool is_cmblk;
   static sptrListT *copysptr_list = NULL;
-  static int uplevel_sptr;
+  static SPTR uplevel_sptr;
   static SPTR single_thread;
   static SPTR in_single;
   SPTR nlower, nupper, nstride;
@@ -1406,7 +1414,7 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
       const int upper = ILM_OPND(ilmp, 2);
       const int stride = ILM_OPND(ilmp, 3);
       const int last = ILM_OPND(ilmp, 4);
-      const DTYPE dtype = (DTYPE)ILM_OPND(ilmp, 5); // ???
+      const DTYPE dtype = ILM_DTyOPND(ilmp, 5);
       ili = ll_make_kmpc_dispatch_next(lower, upper, stride, last, dtype);
       iltb.callfg = 1;
       chk_block(ili);
@@ -1467,9 +1475,9 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
     nupper = ILM_SymOPND(ilmp, 2);
     nstride = ILM_SymOPND(ilmp, 3);
     if (!XBIT(183, 0x100000)) {
-      nlower = (SPTR)getccsym_copy(nlower);   // ???
-      nupper = (SPTR)getccsym_copy(nupper);   // ???
-      nstride = (SPTR)getccsym_copy(nstride); // ???
+      nlower = getccsym_copy(nlower);
+      nupper = getccsym_copy(nupper);
+      nstride = getccsym_copy(nstride);
       ENCLFUNCP(nlower, GBL_CURRFUNC);
       ENCLFUNCP(nupper, GBL_CURRFUNC);
       ENCLFUNCP(nstride, GBL_CURRFUNC);
@@ -1482,7 +1490,7 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
     loop_args.stride = nstride;
     loop_args.chunk = ILM_SymOPND(ilmp, 4);
     loop_args.last = ILM_OPND(ilmp, 5);
-    loop_args.dtype = (DTYPE)ILM_OPND(ilmp, 6); // ???
+    loop_args.dtype = ILM_DTyOPND(ilmp, 6);
     loop_args.sched = (kmpc_sched_e)ILM_OPND(ilmp, 7);
     sched = mp_sched_to_kmpc_sched(loop_args.sched);
     switch (sched) {
@@ -1530,7 +1538,7 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
     loop_args.chunk = ILM_SymOPND(ilmp, 4);
     loop_args.last = ILM_OPND(ilmp, 5);
     loop_args.upperd = ILM_OPND(ilmp, 6);
-    loop_args.dtype = (DTYPE)ILM_OPND(ilmp, 7); // ???
+    loop_args.dtype = ILM_DTyOPND(ilmp, 7);
     loop_args.sched = (kmpc_sched_e)ILM_OPND(ilmp, 8);
     sched = mp_sched_to_kmpc_sched(loop_args.sched);
     switch (sched) {
@@ -1561,7 +1569,7 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
       break;
     const int sched = mp_sched_to_kmpc_sched(ILM_OPND(ilmp, 2));
     if (sched == KMP_ORD_STATIC || sched == KMP_ORD_DYNAMIC_CHUNKED) {
-      ili = ll_make_kmpc_dispatch_fini((DTYPE)ILM_OPND(ilmp, 1)); // ???
+      ili = ll_make_kmpc_dispatch_fini(ILM_DTyOPND(ilmp, 1));
       iltb.callfg = 1;
       chk_block(ili);
     } else if (sched == KMP_SCH_STATIC || sched == KMP_SCH_STATIC_CHUNKED ||
@@ -2676,8 +2684,8 @@ exp_smp(ILM_OP opc, ILM *ilmp, int curilm)
     if (ISTASKDUPG(GBL_CURRFUNC)) {
       INT offset;
       int offset_sptr, ioffset, acon, load, nme;
-      SPTR secarg = (SPTR)ll_get_hostprog_arg(GBL_CURRFUNC, 1);  // ???
-      SPTR lastitr = (SPTR)ll_get_hostprog_arg(GBL_CURRFUNC, 3); // ???
+      SPTR secarg = ll_get_hostprog_arg(GBL_CURRFUNC, 1);
+      SPTR lastitr = ll_get_hostprog_arg(GBL_CURRFUNC, 3);
       offset_sptr = ILM_OPND(ilmp, 1);
       offset = get_isz_cval(offset_sptr);
       /* load from 3rd argument(int litr) into 1st argument at offset */

tools/flang2/flang2exe/ili-rewrite.cpp

@@ -384,7 +384,8 @@ int
 update_ili_operand(int ili, int opnd_index, int new_opnd)
 {
   if (ILI_OPND(ili, opnd_index) != new_opnd) {
-    int j, opc = ILI_OPC(ili);
+    int j;
+    ILI_OP opc = ILI_OPC(ili);
     int opnds = IL_OPRS(opc);
     ILI newili;
     newili.opc = opc;

tools/flang2/flang2exe/ili.h

@@ -40,7 +40,7 @@ typedef unsigned short ILI_OP;
 /***** ILI Declarations *****/
 
 typedef struct {
-  unsigned short opc; /**< Logically an ILI_OP */
+  ILI_OP opc;
   /* practically all hosts will insert 2 bytes of padding here. */
   int hshlnk;
   int count;
@@ -62,7 +62,7 @@ extern ILIB ilib;
 
 #define ILI_REPL(i) ilib.stg_base[i].count
 #define ILI_OPC(i) ((ILI_OP)ilib.stg_base[i].opc)
-#define ILI_OPCP(i, j) ilib.stg_base[i].opc = ((unsigned short)j)
+#define ILI_OPCP(i, j) ilib.stg_base[i].opc = (j)
 #define ILI_HSHLNK(i) ilib.stg_base[i].hshlnk
 #define ILI_VISIT(i) ilib.stg_base[i].visit
 #define ILI_ALT(i) ilib.stg_base[i].alt
@@ -398,39 +398,6 @@ typedef enum CC_RELATION {
 #define SUF_i64x2 0x1000 /*   "   "   "    "    "    "    */
 #define SUF_i64x4 0x2000 /*   "   "   "    "    "    "    */
 
-/*
- * Memory reference size/type codes.
- *
- * Legacy assumptions observed:
- *   -  (code & 3) < 2 if and only if the type size is 1 or 2 bytes.
- *   -  (code & 3) == log2(type size) if the type size is 1, 2, 4, or 8 bytes.
- */
-typedef enum MSZ {
-  MSZ_SBYTE = 0x00,  /* signed byte */
-  MSZ_SHWORD = 0x01, /* signed 16-bit short */
-  MSZ_UBYTE = 0x04,  /* unsigned byte */
-  MSZ_UHWORD = 0x05, /* unsigned 16-bit short */
-
-  /* Codes for types larger than two bytes. These are all distinct values
-   * suitable for use as case labels in switches.  The holes in this sequence
-   * of code values avoid violating the first legacy assumption described above.
-   */
-  MSZ_SWORD = 0x02,  /* signed 32-bit int */
-  MSZ_SLWORD = 0x03, /* signed 64-bit long */
-  MSZ_UWORD = 0x06,  /* unsigned 32-bit int */
-  MSZ_ULWORD = 0x07, /* unsigned 64-bit long */
-  MSZ_FWORD = 0x0a,  /* 32-bit single precision float */
-  MSZ_FLWORD = 0x0b, /* 64-bit double precision float */
-  MSZ_I8 = 0x0f,     /* distinct 64-bit integer type */
-  MSZ_PTR = 0x13,    /* distinct 64-bit pointer type */
-  MSZ_F10 = 0x16,    /* X87 FPU 80-bit extended precision */
-  MSZ_F16 = 0x17,    /* 128-bit quad precision float */
-  MSZ_F32 = 0x1a,    /* 256-bit float */
-  MSZ_F8x2 = 0x1b,   /* 128-bit double-double float */
-
-  MSZ_UNDEF = 0xff, /* undefined MSZ code */
-} MSZ;
-
 #ifdef __cplusplus
 inline MSZ MSZ_ILI_OPND(int i, int opn) {
   return static_cast<MSZ>(ILI_OPND(i, opn));
@@ -527,6 +494,19 @@ extern bool share_qjsr_ili; /* defd in iliutil.c */
 
 #include "iliutil.h"
 
+#ifdef __cplusplus
+inline MSZ GetILI_MSZ_OF_Load(int ilix) {
+  return static_cast<MSZ>(ILI_MSZ_OF_LD(ilix));
+}
+#undef ILI_MSZ_OF_LD
+#define ILI_MSZ_OF_LD GetILI_MSZ_OF_Load
+inline MSZ GetILI_MSZ_OF_Store(int ilix) {
+  return static_cast<MSZ>(ILI_MSZ_OF_ST(ilix));
+}
+#undef ILI_MSZ_OF_ST
+#define ILI_MSZ_OF_ST GetILI_MSZ_OF_Store
+#endif
+
 #endif /* !ILITP_UTIL */
 
 #endif /* ILI_H_ */