Changeset 4215 in vbox for trunk/src/VBox/Debugger

Timestamp:

Aug 18, 2007 7:00:34 AM (17 years ago)

Author:

vboxsync

Message:

Fixed an endless loop in 'd?'. Fixed parameter chopping so it respect multiple unary ops and lack of spaces around ops.

File:

• trunk/src/VBox/Debugger/DBGConsole.cpp (modified) (10 diffs)

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -876 +876 @@
 };
 
+/** Bitmap where set bits indicates the characters the may start an operator name. */
+static uint32_t g_bmOperatorChars[256 / (4*8)];
+
 /** Register symbol uUser value.
  * @{
@@ -3057 +3060 @@
             if (pDbgc->cbDumpElement == 1)
             {
-                while (i < sizeof(achBuffer))
+                while (i++ < sizeof(achBuffer))
                     pCmdHlp->pfnPrintf(pCmdHlp, NULL, "   ");
                 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "  ");
@@ -5436 +5439 @@
          */
         case DBGCVAR_TYPE_NUMBER:
+            *pResult = *pArg1;
             switch (pArg2->enmType)
             {
+                case DBGCVAR_TYPE_SYMBOL:
                 case DBGCVAR_TYPE_STRING:
                     rc = dbgcSymbolGet(pDbgc, pArg2->u.pszString, DBGCVAR_TYPE_NUMBER, &Var);
@@ -5692 +5697 @@
          */
         case DBGCVAR_TYPE_NUMBER:
+            *pResult = *pArg1;
             switch (pArg2->enmType)
             {
+                case DBGCVAR_TYPE_SYMBOL:
                 case DBGCVAR_TYPE_STRING:
                     rc = dbgcSymbolGet(pDbgc, pArg2->u.pszString, DBGCVAR_TYPE_NUMBER, &Var);
@@ -7293 +7300 @@
 }
 
+
+/**
+ * Initalizes g_bmOperatorChars.
+ */
+static void dbgcInitOpCharBitMap(void)
+{
+    memset(g_bmOperatorChars, 0, sizeof(g_bmOperatorChars));
+    for (unsigned iOp = 0; iOp < RT_ELEMENTS(g_aOps); iOp++)
+        ASMBitSet(&g_bmOperatorChars[0], (uint8_t)g_aOps[iOp].szName[0]);
+}
+
+
+/**
+ * Checks whether the character may be the start of an operator.
+ *
+ * @returns true/false.
+ * @param   ch      The character.
+ */
+DECLINLINE(bool) dbgcIsOpChar(char ch)
+{
+    return ASMBitTest(&g_bmOperatorChars[0], (uint8_t)ch);
+}
 
 
@@ -7933 +7962 @@
         else if (cPar == 0 && !isblank(ch))
         {
-            PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, fBinary, chPrev);
+            PCDBGCOP pOp = dbgcIsOpChar(ch)
+                         ? dbgcOperatorLookup(pDbgc, psz, fBinary, chPrev)
+                         : NULL;
             if (pOp)
             {
@@ -8088 +8119 @@
         char   *psz     = pszArgs;
         char    ch;
+        bool    fBinary = false;
         for (;;)
         {
@@ -8126 +8158 @@
              */
             else if (ch == '(')
+            {
                 cPar++;
+                fBinary = false;
+            }
             else if (ch == ')')
             {
@@ -8132 +8167 @@
                     return VERR_PARSE_UNBALANCED_PARENTHESIS;
                 cPar--;
+                fBinary = true;
             }
-            /*
-             * Encountering blanks may mean the end of it all. But of course not
-             * while inside a quotation or paranthesis. A binary operator will
-             * also force continued parsing.
-             */
-            else if (isblank(ch) && !cPar && !chQuote)
+            else if (!chQuote && !cPar)
             {
-                pszEnd = psz++;         /* just in case. */
-                while (isblank(*psz))
-                    psz++;
-                PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, true, ' ');
-                if (!pOp || !pOp->fBinary)
-                    break;              /* the end. */
-                if (pOp)
+                /*
+                 * Encountering blanks may mean the end of it all. A binary operator
+                 * will force continued parsing.
+                 */
+                if (isblank(*psz))
+                {
+                    pszEnd = psz++;         /* just in case. */
+                    while (isblank(*psz))
+                        psz++;
+                    PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, fBinary, ' ');
+                    if (!pOp || pOp->fBinary != fBinary)
+                        break;              /* the end. */
                     psz += pOp->cchName;
-
-                while (isblank(*psz))   /* skip blanks so we don't get here again */
-                    psz++;
-                continue;
+                    while (isblank(*psz))   /* skip blanks so we don't get here again */
+                        psz++;
+                    fBinary = false;
+                    continue;
+                }
+
+                /*
+                 * Look for operators without a space up front.
+                 */
+                if (dbgcIsOpChar(*psz))
+                {
+                    PCDBGCOP pOp = dbgcOperatorLookup(pDbgc, psz, fBinary, ' ');
+                    if (pOp)
+                    {
+                        if (pOp->fBinary != fBinary)
+                            break;              /* the end. */
+                        psz += pOp->cchName;
+                        while (isblank(*psz))   /* skip blanks so we don't get here again */
+                            psz++;
+                        fBinary = false;
+                        continue;
+                    }
+                    fBinary = true;
+                }
             }
 
@@ -8698 +8754 @@
     pDbgc->cInputLines      = 0;
 
+    dbgcInitOpCharBitMap();
+
     /*
      * Print welcome message.