core/util: indirection to CommandLine class added to make bochs compile

If CommandLine.hpp and (indirectly) optionparser.h is #included in
FailBochsInit.ah, bochs compilation fails (for, e.g., gui/x.cc, at least
on Debian 6).

src/core/sal/bochs/FailBochsInit.ah

@@ -6,12 +6,11 @@
 #ifdef BUILD_BOCHS
 
 #include "../SALInst.hpp"
-#include "util/CommandLine.hpp"
 
 aspect FailBochsInit {
 	advice call("int bxmain()") : before ()
 	{
-        fail::CommandLine::Inst().collect_args(bx_startup_flags.argc, bx_startup_flags.argv);
+        fail::simulator.collectCommandLineArguments(bx_startup_flags.argc, bx_startup_flags.argv);
 		fail::simulator.startup();
 	}
 };