Fix bug in --sim and --debug options reported by Bob Lantz.

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index a4b0feb5ccd52a43a5160871e3ee59cc0260b94e..94132052b30e4b22feba396b0f58b8b57b928a2c 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -46,18 +46,18 @@ sub parse_command_line {
        while ((my $arg = shift (@kernel_args)) ne '--') {
            push (@ARGV, $arg);
        }
-       GetOptions ("sim=s" => sub { set_sim (@_) },
+       GetOptions ("sim=s" => sub { set_sim ($_[1]) },
                    "bochs" => sub { set_sim ("bochs") },
                    "qemu" => sub { set_sim ("qemu") },
                    "player" => sub { set_sim ("player") },
 
-                   "debug=s" => sub { set_debug (@_) },
+                   "debug=s" => sub { set_debug ($_[1]) },
                    "no-debug" => sub { set_debug ("none") },
                    "monitor" => sub { set_debug ("monitor") },
                    "gdb" => sub { set_debug ("gdb") },
 
                    "m|memory=i" => \$mem,
-                   "j|jitter=i" => sub { set_jitter (@_) },
+                   "j|jitter=i" => sub { set_jitter ($_[1]) },
                    "r|realtime" => sub { set_realtime () },
 
                    "T|timeout=i" => \$timeout,
@@ -410,7 +410,7 @@ panic: action=fatal
 EOF
     print BOCHSRC "gdbstub: enabled=1\n" if $debug eq 'gdb';
     print BOCHSRC "clock: sync=", $realtime ? 'realtime' : 'none',
-      " time0=0\n";
+      ", time0=0\n";
     print_bochs_disk_line ("ata0-master", 0);
     print_bochs_disk_line ("ata0-slave", 1);
     if (defined ($disks_by_iface[2]{FILE_NAME})