Changeset 2797 in kBuild for trunk/src/kmk/kmk_cc_exec.c

Timestamp:

Sep 19, 2015 3:35:39 PM (10 years ago)

Author:

bird

Message:

kmk_cc_exec.c: gcc build fixes

File:

• trunk/src/kmk/kmk_cc_exec.c (modified) (21 diffs)

trunk/src/kmk/kmk_cc_exec.c

@@ -110 +110 @@
 # define KMK_CC_STATIC_ASSERT_EX(a_Expr, a_szExpl)  typedef int KMK_CC_STATIC_ASSERT_EX_TYPE[(a_Expr) ? 1 : 0]
 #else
-# define KMK_CC_STATIC_ASSERT_EX(a_Expr, a_szExpl)  extern int KMK_CC_STATIC_ASSERT_EX_VAR[(aExpr) ? 1 : 0]
+# define KMK_CC_STATIC_ASSERT_EX(a_Expr, a_szExpl)  extern int KMK_CC_STATIC_ASSERT_EX_VAR[(a_Expr) ? 1 : 0]
 extern int KMK_CC_STATIC_ASSERT_EX_VAR[1];
 #endif
@@ -2027 +2027 @@
 
                         /* First loop: Identify potential function calls and dynamic expansion. */
-                        KMK_CC_ASSERT(!func_char_map[chOpen]);
-                        KMK_CC_ASSERT(!func_char_map[chClose]);
-                        KMK_CC_ASSERT(!func_char_map['$']);
+                        KMK_CC_ASSERT(!func_char_map[(unsigned char)chOpen]);
+                        KMK_CC_ASSERT(!func_char_map[(unsigned char)chClose]);
+                        KMK_CC_ASSERT(!func_char_map[(unsigned char)'$']);
                         while (cchName < cchStr)
                         {
                             ch = pchStr[cchName];
-                            if (!func_char_map[(int)ch])
+                            if (!func_char_map[(unsigned char)ch])
                                 break;
                             cchName++;
@@ -2092 +2092 @@
                             if (cArgs < cMinArgs)
                             {
-                                fatal(NULL, _("Function '%.*s' takes a minimum of %d arguments: %d given"),
+                                fatal(NULL, _("Function '%s' takes a minimum of %d arguments: %d given"),
                                       pszFunction, (int)cMinArgs, (int)cArgs);
                                 return -1; /* not reached */
@@ -2278 +2278 @@
     if (pProg)
     {
-        int rc = 0;
-
         pProg->pBlockTail   = pBlock;
         pProg->pFirstInstr  = (PKMKCCEXPCORE)kmk_cc_block_get_next_ptr(pBlock);
@@ -2814 +2812 @@
 
 
+#if 0
 /**
  * Checks whether we've got an EOL escape sequence or not.
@@ -2835 +2834 @@
     return (offEol - offFirstBackslash) & 1;
 }
+#endif
 
 
@@ -3147 +3147 @@
  */
 #if defined(KBUILD_ARCH_X86) || defined(KBUILD_ARCH_AMD64) /* Unaligned access is reasonably cheap. */
-# define KMK_CC_WORD_COMP_CONST_0(a_pchLine, a_pszWord) (1)
 # define KMK_CC_WORD_COMP_CONST_2(a_pchLine, a_pszWord) \
         (   *(uint16_t const *)(a_pchLine)     == *(uint16_t const *)(a_pszWord) )
@@ -3174 +3173 @@
          && ((uint64_t const *)(a_pchLine))[1] == ((uint64_t const *)(a_pszWord))[1] )
 #else
-# define KMK_CC_WORD_COMP_CONST_0(a_pchLine, a_pszWord) (1)
 # define KMK_CC_WORD_COMP_CONST_2(a_pchLine, a_pszWord) \
         (   (a_pchLine)[0] == (a_pszWord)[0] \
@@ -3246 +3244 @@
          && (a_pchLine)[15] == (a_pszWord)[15])
 #endif
+/** See if a starting of a given length starts with a constant word. */
+#define KMK_CC_WORD_COMP_IS_EOL(a_pCompiler, a_pchLine, a_cchLine) \
+    (   (a_cchLine) == 0 \
+     || KMK_CC_EVAL_IS_SPACE((a_pchLine)[0]) \
+     || ((a_pchLine)[0] == '\\' && (a_pchLine)[1] == (a_pCompiler)->chFirstEol) ) \
+
 /** See if a starting of a given length starts with a constant word. */
 #define KMK_CC_WORD_COMP_CONST(a_pCompiler, a_pchLine, a_cchLine, a_pszWord, a_cchWord) \
@@ -3701 +3705 @@
 
 
+#if 0  /* unused atm */
 /**
  * Prepares for copying a command line.
@@ -3821 +3826 @@
     }
 }
+#endif /* unused atm */
 
 
@@ -3897 +3903 @@
     unsigned const  cEscEols = pCompiler->cEscEols;
 
-    KMK_CC_ASSERT(cchLeft >= 0);
     KMK_CC_ASSERT(iEscEol <= cEscEols);
 
@@ -4323 +4328 @@
 //            unsigned cCounts;
 
+
+
             /* Skip the parenthesis. */
             pchWord++;
@@ -4468 +4475 @@
             cchLeft -= 2;
 
-            if (KMK_CC_WORD_COMP_CONST(pCompiler, pchWord, cchLeft, "", 0))
+            if (KMK_CC_WORD_COMP_IS_EOL(pCompiler, pchWord, cchLeft))
                 return kmk_cc_eval_do_if(pCompiler, pchWord, cchLeft, 1 /* in else */);
 
@@ -4796 +4803 @@
         if (ch2 == 'f')
         {
-            if (KMK_CC_WORD_COMP_CONST(pCompiler, pchWord, cchLeft, "", 0))
+            if (KMK_CC_WORD_COMP_IS_EOL(pCompiler, pchWord, cchLeft))
                 return kmk_cc_eval_do_if(pCompiler, pchWord, cchLeft, 0 /* in else */);
 
@@ -4822 +4829 @@
             pchWord += 5;
             cchLeft -= 5;
-            if (KMK_CC_WORD_COMP_CONST(pCompiler, pchWord, cchLeft, "", 0))
+            if (KMK_CC_WORD_COMP_IS_EOL(pCompiler, pchWord, cchLeft))
                 return kmk_cc_eval_do_include(pCompiler, pchWord, cchLeft, kKmkCcEvalInstr_include);
             if (cchLeft >= 3 && KMK_CC_WORD_COMP_CONST_3(pchWord, "dep"))
@@ -4828 +4835 @@
                 pchWord += 3;
                 cchLeft -= 3;
-                if (KMK_CC_WORD_COMP_CONST(pCompiler, pchWord, cchLeft, "", 0))
+                if (KMK_CC_WORD_COMP_IS_EOL(pCompiler, pchWord, cchLeft))
                     return kmk_cc_eval_do_include(pCompiler, pchWord, cchLeft, kKmkCcEvalInstr_includedep);
                 if (KMK_CC_WORD_COMP_CONST(pCompiler, pchWord, cchLeft, "-queue", 6))
@@ -4920 +4927 @@
                     if (&pszContent[offNext] == pchTmp)
                     {
-fprintf(stderr, "#%03u: <empty>\n", Compiler.iLine, &pszContent[off]);
+fprintf(stderr, "#%03u: <empty>\n", Compiler.iLine);
                         Compiler.iLine++;
                         off = offNext += cchEolSeq;
@@ -4927 +4934 @@
                     if (pszContent[offNext] == '#')
                     {
-fprintf(stderr, "#%03u: <comment>\n", Compiler.iLine, &pszContent[off]);
+fprintf(stderr, "#%03u: <comment>\n", Compiler.iLine);
                         Compiler.iLine++;
                         offNext = pchTmp - pszContent;
@@ -4959 +4966 @@
                     {
                         size_t offEol = off + cchLine;
-                        while (offFirstWord < off + cchLine && KMK_CC_EVAL_IS_SPACE(pszContent[offFirstWord]))
+                        while (offFirstWord < offEol && KMK_CC_EVAL_IS_SPACE(pszContent[offFirstWord]))
                             offFirstWord++;
                     }
@@ -5139 +5146 @@
     if (pEvalProg)
     {
-        int rc = 0;
-
         pEvalProg->pBlockTail   = pBlock;
         pEvalProg->pFirstInstr  = (PKMKCCEVALCORE)kmk_cc_block_get_next_ptr(pBlock);