Changeset 531 for trunk/src/gmake/kbuild.c

Timestamp:

Sep 18, 2006, 1:49:49 AM (19 years ago)

Author:

bird

Message:

skip some unnecessary copies and allocations.

File:

• trunk/src/gmake/kbuild.c (modified) (15 diffs)

trunk/src/gmake/kbuild.c

@@ -51 +51 @@
 kbuild_get_variable(const char *pszName)
 {
+#ifndef NDEBUG
+    unsigned i;
+#endif 
     struct variable *pVar = lookup_variable(pszName, strlen(pszName));
     if (!pVar)
@@ -56 +59 @@
     if (pVar->recursive)
         fatal(NILF, _("variable `%s' is defined as `recursive' instead of `simple'!"), pszName);
-    pVar->value_length = strlen(pVar->value);
+#ifndef NDEBUG
+    i = strlen(pVar->value);
+    if (i != pVar->value_length)
+    {
+        printf("%d != %d %s\n", pVar->value_length, i, pVar->name);
+        __asm int 3;
+    }
+#endif
     return pVar;
 }
@@ -70 +80 @@
 kbuild_get_recursive_variable(const char *pszName)
 {
+#ifndef NDEBUG
+    unsigned i;
+#endif 
     struct variable *pVar = lookup_variable(pszName, strlen(pszName));
     if (!pVar)
         fatal(NILF, _("variable `%s' isn't defined!"), pszName);
-    pVar->value_length = strlen(pVar->value);
+#ifndef NDEBUG
+    i = strlen(pVar->value);
+    if (i != pVar->value_length)
+    {
+        printf("%d != %d %s\n", pVar->value_length, i, pVar->name);
+        __asm int 3;
+    }
+#endif
     return pVar;
 }
@@ -90 +110 @@
     struct variable *pVar = lookup_variable(pszName, strlen(pszName));
     if (pVar)
-        pVar->value_length = strlen(pVar->value);
+    {
+#ifndef NDEBUG
+        unsigned i = strlen(pVar->value);
+        if (i != pVar->value_length)
+        {
+            printf("%d != %d %s\n", pVar->value_length, i, pVar->name);
+            __asm int 3;
+        }
+#endif
+    }
     return pVar;
 }
@@ -230 +259 @@
             *pszEnd = '\0';
             if (!strchr(pszEnd, '$'))
-                pVar = define_variable(pszVarName, strlen(pszVarName), psz, o_file, 0 /* !recursive */);
+                pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz, 
+                                          1 /* duplicate */, o_file, 0 /* !recursive */);
             else
             {
@@ -244 +274 @@
                 {
                     *pszExpEnd = '\0';
-                    pVar = define_variable(pszVarName, strlen(pszVarName), pszExp, o_file, 0 /* !recursive */);
+                    pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszExp, 
+                                              pszExpEnd - pszExp, 1 /* duplicate */,
+                                              o_file, 0 /* !recursive */);
                 }
                 else
@@ -362 +394 @@
         + pszSrcEnd - pszSrc
         + 1;
-    psz = pszResult = alloca(cch);
+    psz = pszResult = xmalloc(cch);
 
     memcpy(psz, pPathTarget->value, pPathTarget->value_length); psz += pPathTarget->value_length;
@@ -374 +406 @@
      * Define the variable in the current set and return it.
      */
-    return define_variable(pszVarName, strlen(pszVarName), pszResult, o_file, 0 /* !recursive */);
+    return define_variable_vl(pszVarName, strlen(pszVarName), pszResult, cch - 1, 
+                              0 /* use pszResult */, o_file, 0 /* !recursive */);
 }
 
@@ -440 +473 @@
             *pszEnd = '\0';
             if (!strchr(pszEnd, '$'))
-                pVar = define_variable(pszVarName, strlen(pszVarName), psz, o_file, 0 /* !recursive */);
+                pVar = define_variable_vl(pszVarName, strlen(pszVarName), psz, pszEnd - psz, 
+                                          1 /* duplicate */, o_file, 0 /* !recursive */);
             else
             {
@@ -454 +488 @@
                 {
                     *pszExpEnd = '\0';
-                    pVar = define_variable(pszVarName, strlen(pszVarName), pszExp, o_file, 0 /* !recursive */);
+                    pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszExp, 
+                                              pszExpEnd - pszExp, 1 /* duplicate */, 
+                                              o_file, 0 /* !recursive */);
                 }
                 else
@@ -954 +990 @@
             free(paVars[iVar].pszExp);
     }
-    psz[-(cchTotal != 0)] = '\0';
-
-    pVar = define_variable(pszVarName, strlen(pszVarName), pszResult, o_file, 0 /* !recursive */);
-    free(pszResult);
+    if (psz != pszResult)
+        psz--;
+    *psz = '\0';
+    cchTotal = psz - pszResult;
+
+    pVar = define_variable_vl(pszVarName, strlen(pszVarName), pszResult, cchTotal,
+                              0 /* take pszResult */ , o_file, 0 /* !recursive */);
     return pVar;
 }
@@ -1021 +1060 @@
     memcpy(psz, pObjSuff->value, pObjSuff->value_length);   psz += pObjSuff->value_length;
     memcpy(psz, pDepSuff->value, pDepSuff->value_length + 1);
-    *ppDep = define_variable("dep", 3, pszResult, o_file, 0 /* !recursive */);
+    *ppDep = define_variable_vl("dep", 3, pszResult, cch - 1, 1 /*dup*/, o_file, 0 /* !recursive */);
 
     /* 
@@ -1027 +1066 @@
      */
     *psz = '\0';
-    pObj = define_variable(pszVarName, strlen(pszVarName), pszResult, o_file, 0 /* !recursive */);
+    pObj = define_variable_vl(pszVarName, strlen(pszVarName), pszResult, psz - pszResult, 
+                              1/* dup */, o_file, 0 /* !recursive */);
 
     /* 
@@ -1077 +1117 @@
 
     /* set global variable */
-    define_variable_global(pszName, cch, pszResult, o_file, 0 /* !recursive */, NILF);
+    define_variable_vl_global(pszName, cch, pszResult, psz - pszResult, 1/*dup*/, o_file, 0 /* !recursive */, NILF);
 
     /*
@@ -1092 +1132 @@
         *psz = '\0';
     }
-    *ppDirDep = define_variable("dirdep", 6, pszResult, o_file, 0 /* !recursive */);
+    *ppDirDep = define_variable_vl("dirdep", 6, pszResult, psz - pszResult, 1/*dup*/, o_file, 0 /* !recursive */);
 
     return pObj;