Fix the dumpil /i on Linux (#1479)

On Linux/MacOS '/' isn't allowed as an option but the dumpil command had '/i'. The reason '/' is not allowed on xplat is that it caused problems parsing file paths as args. It most cases '-' is used except for this case and for the dml '/d' which isn't supported on lldb.

I'll fix it by adding -i as an option to dumpil and add it to the doc.

This also give me the chance to remove a bunch of unnecessary #ifndef FEATURE_PAL around the "/d" DML option.

Issue #https://github.com/dotnet/diagnostics/issues/1478

diff --git a/src/SOS/Strike/sosdocs.txt b/src/SOS/Strike/sosdocs.txt
index 6e4ce208f525813924f415a4a87b2a359431bea0..99d49ac8b122077129cadf47693017845181640d 100644 (file)
--- a/src/SOS/Strike/sosdocs.txt
+++ b/src/SOS/Strike/sosdocs.txt
@@ -1873,7 +1873,7 @@ COMMAND: dumpil.
 !DumpIL <Managed DynamicMethod object> | 
         <DynamicMethodDesc pointer> |
         <MethodDesc pointer> |
-        /i <IL pointer>
+        -i <IL pointer>
 
 !DumpIL prints the IL code associated with a managed method. We added this
 function specifically to debug DynamicMethod code which was constructed on
@@ -1887,7 +1887,7 @@ You can use it in four ways:
      IL associated with the dynamic method.
   3) If you have an ordinary MethodDesc, you can see the IL for that as well,
      just pass it as the first argument.
-  4) If you have a pointer directly to the IL, specify /i followed by the
+  4) If you have a pointer directly to the IL, specify -i followed by the
      the IL address.  This is useful for writers of profilers that instrument
      IL.
      

diff --git a/src/SOS/Strike/sosdocsunix.txt b/src/SOS/Strike/sosdocsunix.txt
index 96e2e0b9a731de3d3f6b90bf9ed4326f1493eb6e..196e1c5556a392ce3e11b8790e074de93e3c7513 100644 (file)
--- a/src/SOS/Strike/sosdocsunix.txt
+++ b/src/SOS/Strike/sosdocsunix.txt
@@ -1565,7 +1565,7 @@ COMMAND: dumpil.
 DumpIL <Managed DynamicMethod object> | 
        <DynamicMethodDesc pointer> |
        <MethodDesc pointer> |
-        /i <IL pointer>
+       -i <IL pointer>
 
 DumpIL prints the IL code associated with a managed method. We added this
 function specifically to debug DynamicMethod code which was constructed on
@@ -1579,7 +1579,7 @@ You can use it in four ways:
      IL associated with the dynamic method.
   3) If you have an ordinary MethodDesc, you can see the IL for that as well,
      just pass it as the first argument.
-  4) If you have a pointer directly to the IL, specify /i followed by the
+  4) If you have a pointer directly to the IL, specify -i followed by the
      the IL address.  This is useful for writers of profilers that instrument
      IL.
      

diff --git a/src/SOS/Strike/strike.cpp b/src/SOS/Strike/strike.cpp
index 24b9c41f2bb773ebcdd951a34f15bab7ebe98634..d4cccb3d6c47417c2f997d88f4b0c3826608b03d 100644 (file)
--- a/src/SOS/Strike/strike.cpp
+++ b/src/SOS/Strike/strike.cpp
@@ -277,9 +277,7 @@ DECLARE_API(IP2MD)
     TADDR IP = 0;
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -469,9 +467,7 @@ DECLARE_API(DumpStack)
         {"-EE", &DSFlag.fEEonly, COBOOL, FALSE},
         {"-n",  &DSFlag.fSuppressSrcInfo, COBOOL, FALSE},
         {"-unwind",  &unwind, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
     CMDValue arg[] = {
         // vptr, type
@@ -529,9 +525,7 @@ DECLARE_API (EEStack)
     {   // name, vptr, type, hasValue
         {"-EE", &DSFlag.fEEonly, COBOOL, FALSE},
         {"-short", &bShortList, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
 
     if (!GetCMDOption(args, option, _countof(option), NULL, 0, NULL))
@@ -710,9 +704,7 @@ DECLARE_API(DumpStackObjects)
     CMDOption option[] =
     {   // name, vptr, type, hasValue
         {"-verify", &bVerify, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -748,9 +740,7 @@ DECLARE_API(DumpMD)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -867,8 +857,9 @@ DECLARE_API(DumpIL)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-        {"/d", &dml, COBOOL, FALSE},
+        {"-i", &fILPointerDirectlySpecified, COBOOL, FALSE},
         {"/i", &fILPointerDirectlySpecified, COBOOL, FALSE},
+        {"/d", &dml, COBOOL, FALSE},
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -1166,9 +1157,7 @@ DECLARE_API(DumpClass)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -1289,9 +1278,7 @@ DECLARE_API(DumpMT)
     CMDOption option[] =
     {   // name, vptr, type, hasValue
         {"-MD", &bDumpMDTable, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -1852,9 +1839,7 @@ DECLARE_API(DumpArray)
         {"-length", &flags.Length, COSIZE_T, TRUE},
         {"-details", &flags.bDetail, COBOOL, FALSE},
         {"-nofields", &flags.bNoFieldsForElement, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -2070,9 +2055,7 @@ DECLARE_API(DumpObj)
     {   // name, vptr, type, hasValue
         {"-nofields", &bNoFields, COBOOL, FALSE},
         {"-refs", &bRefs, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -2130,9 +2113,7 @@ DECLARE_API(DumpALC)
     StringHolder str_Object;
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -2900,9 +2881,7 @@ DECLARE_API(PrintException)
         {"-lines", &bLineNumbers, COBOOL, FALSE},
         {"-l", &bLineNumbers, COBOOL, FALSE},
         {"-ccw", &bCCW, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -3067,9 +3046,7 @@ DECLARE_API(DumpVC)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE}
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -3937,9 +3914,7 @@ public:
             {"-max", &mMaxSize, COHEX, TRUE},        // max size of objects to display
             {"-live", &mLive, COHEX, FALSE},         // only print live objects
             {"-dead", &mDead, COHEX, FALSE},         // only print dead objects
-#ifndef FEATURE_PAL
             {"/d", &mDML, COBOOL, FALSE},            // Debugger Markup Language
-#endif
         };
 
         CMDValue arg[] =
@@ -4647,9 +4622,7 @@ DECLARE_API(DumpAsync)
             { "-fields", &dumpFields, COBOOL, FALSE },          // show relevant fields of found async objects
             { "-stacks", &includeStacks, COBOOL, FALSE },       // gather and output continuation/stack information
             { "-roots", &includeRoots, COBOOL, FALSE },         // gather and output GC root information
-#ifndef FEATURE_PAL
             { "/d", &dml, COBOOL, FALSE },                      // Debugger Markup Language
-#endif
         };
         if (!GetCMDOption(args, option, _countof(option), NULL, 0, &nArg) || nArg != 0)
         {
@@ -5328,16 +5301,6 @@ DECLARE_API(ListNearObj)
 
     TADDR taddrArg = 0;
     TADDR taddrObj = 0;
-    // we may want to provide a more exact version of searching for the
-    // previous object in the heap, using the brick table, instead of
-    // looking for what may be valid method tables...
-    //BOOL bExact;
-    //CMDOption option[] =
-    //{
-    //    // name, vptr, type, hasValue
-    //    {"-exact", &bExact, COBOOL, FALSE}
-    //};
-
     BOOL dml = FALSE;
     CMDOption option[] =
     {   // name, vptr, type, hasValue
@@ -6180,9 +6143,7 @@ DECLARE_API(DumpModule)
     CMDOption option[] =
     {   // name, vptr, type, hasValue
         {"-mt", &bMethodTables, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
         {"-prof", &bProfilerModified, COBOOL, FALSE},
     };
     CMDValue arg[] =
@@ -6351,9 +6312,7 @@ DECLARE_API(DumpDomain)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -6474,9 +6433,7 @@ DECLARE_API(DumpAssembly)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -7044,9 +7001,7 @@ DECLARE_API(Threads)
         {"-special", &bPrintSpecialThreads, COBOOL, FALSE},
         {"-live", &bPrintLiveThreadsOnly, COBOOL, FALSE},
         {"-managedexception", &bSwitchToManagedExceptionThread, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     if (!GetCMDOption(args, option, _countof(option), NULL, 0, NULL))
     {
@@ -8569,9 +8524,7 @@ DECLARE_API(ThreadPool)
         {   // name, vptr, type, hasValue
             {"-ti", &doHCDump, COBOOL, FALSE},
             {"-wi", &doWorkItemDump, COBOOL, FALSE},
-#ifndef FEATURE_PAL
             {"/d", &dml, COBOOL, FALSE},
-#endif
         };
 
         if (!GetCMDOption(args, option, _countof(option), NULL, 0, NULL))
@@ -8874,9 +8827,7 @@ DECLARE_API(FindAppDomain)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -9537,9 +9488,7 @@ DECLARE_API(u)
         {"-o", &bDisplayOffsets, COBOOL, FALSE},
         {"-il", &bIL, COBOOL, FALSE},
         {"-map", &bDisplayILMap, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type
@@ -10993,9 +10942,7 @@ DECLARE_API(Token2EE)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
 
     CMDValue arg[] =
@@ -11087,9 +11034,7 @@ DECLARE_API(Name2EE)
 
     CMDOption option[] =
     {   // name, vptr, type, hasValue
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
 
     CMDValue arg[] =
@@ -11263,9 +11208,7 @@ DECLARE_API(GCRoot)
     {   // name, vptr, type, hasValue
         {"-nostacks", &bNoStacks, COBOOL, FALSE},
         {"-all", &all, COBOOL, FALSE},
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
 
@@ -14491,9 +14434,7 @@ DECLARE_API(ClrStack)
         {"-gc", &bGC, COBOOL, FALSE},
         {"-f", &bFull, COBOOL, FALSE},
         {"-r", &bDisplayRegVals, COBOOL, FALSE },
-#ifndef FEATURE_PAL
         {"/d", &dml, COBOOL, FALSE},
-#endif
     };
     CMDValue arg[] =
     {   // vptr, type