X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Futils%2Fpintos;h=5557535457f34c1d9d71c374bea7c8f998a5cc67;hb=592a61ce0fad1854d446b1bdbdc7962bfa868bc2;hp=3cd9fef25c9bd76ed54265e529bdb5f932182c8f;hpb=8fc448c07982e2f706487356555688e2ed91f046;p=pintos-anon

diff --git a/src/utils/pintos b/src/utils/pintos
index 3cd9fef..5557535 100755
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -1,21 +1,46 @@
 #! /usr/bin/perl
 
-$sim = "bochs";
+$mem = 4;
+$serial_out = 1;
 while (@ARGV) {
     my ($arg) = shift (@ARGV);
-    if ($arg eq '--bochs' || $arg eq '--bochs-dbg' || $arg eq '--bochs-gdb'
-	|| $arg eq '--qemu' || $arg eq '--vmware') {
-	$sim = substr ($arg, 2);
+    if ($arg =~ /--(bochs|qemu|gsx)$/) {
+	die "$arg conflicts with --$sim\n" if defined $sim;
+	$sim = $1;
+    } elsif ($arg =~ /--(no-debug|monitor|gdb)$/) {
+	die "$debug conflicts with --$debug" if defined $debug;
+	$debug = $1;
     } elsif ($arg eq 'run') {
 	run_vm (@ARGV);
 	exit 0;
+    } elsif ($arg =~ /^--mem(?:ory)?=(\d+)/) {
+	$mem = $1;
+    } elsif ($arg eq '-m') {
+	die "-m needs integer argument\n" if !@ARGV || $ARGV[0] !~ /^-?\d+$/;
+	$mem = shift (@ARGV);
+    } elsif ($arg eq '-j') {
+	die "-j need random seed argument\n" if !@ARGV;
+	die "-j need integer argument\n" if $ARGV[0] !~ /^-?\d+$/;
+	$jitter = shift (@ARGV);
+    } elsif ($arg =~ /--jitter=(-?\d+)$/) {
+	$jitter = $1;
+    } elsif ($arg eq '--no-vga' || $arg eq '-v') {
+	print "warning: --no-vga conflicts with --terminal\n"
+	    if $vga eq 'terminal';
+	$vga = 'none';
+    } elsif ($arg eq '--no-serial' || $arg eq '-s') {
+	$serial_out = 0;
+    } elsif ($arg eq '--terminal' || $arg eq '-t') {
+	print "warning: --terminal conflicts with --no-vga\n"
+	    if $vga eq 'none';
+	$vga = 'terminal';
     } elsif ($arg eq 'make-disk') {
 	usage () if @ARGV != 2;
-	my ($file, $kb) = @ARGV;
-	usage () if $kb =~ /^\d+$/;
+	my ($file, $mb) = @ARGV;
+	usage () if $mb !~ /^\d+(\.\d+)?|\.\d+$/;
 	die "$file: already exists\n" if -e $file;
 
-	create_disk ($file, $kb);
+	create_disk ($file, int ($mb * 1008));
 	exit 0;
     } elsif ($arg eq 'put') {
 	usage () if @ARGV != 1 && @ARGV != 2;
@@ -28,7 +53,7 @@ while (@ARGV) {
 	copy_pad ($hostfn, "scratch.dsk", 512);
 
 	# Do copy.
-	run_vm ("-ci", $hostfn, $size, "-q");
+	run_vm ("-ci", $guestfn, $size, "-q");
 	exit 0;
     } elsif ($arg eq 'get') {
 	usage () if @ARGV != 1 && @ARGV != 2;
@@ -46,21 +71,26 @@ while (@ARGV) {
 	    if $scratch_size < $fs_size + 16384;
 
 	# Do copy.
-	run_vm ("-co", $guestfn, $hostfn, "-q");
+	run_vm ("-co", $guestfn, "-q");
 
 	# Read out scratch disk.
+	print "copying $guestfn from scratch.dsk to $hostfn...\n";
 	open (SRC, "<scratch.dsk") or die "scratch.dsk: open: $!\n";
 	open (DST, ">$hostfn") or die "$hostfn: create: $!\n";
 	my ($input);
 	read (SRC, $input, 512) == 512 or die "scratch.dsk: read error\n";
 	my ($size) = unpack ("%V", $input);
 	$size != 0xffffffff or die "$guestfn: too big for scratch.dsk?";
-	read (SRC, $src, $size) == $src or die "scratch.dsk: read error\n";
+	read (SRC, $src, $size) == $size or die "scratch.dsk: read error\n";
 	print DST $src or die "$hostfn: write error\n";
 	close (DST);
 	close (SRC);
 
 	exit 0;
+    } elsif ($arg eq 'help' || $arg eq '--help') {
+	usage (0);
+    } else {
+	die "unknown option `$arg'\n";
     }
 }
 usage ();
@@ -72,47 +102,45 @@ sub usage {
     print "Usage: pintos [OPTION...] COMMAND [ARG...]\n";
     print "where COMMAND is one of the following:\n";
     print "  run [CMDLINE...]        run a VM in the simulator\n";
-    print "  make-disk FILE.DSK KB   create FILE.DSK as empty KB-kB disk\n";
+    print "  make-disk FILE.DSK SIZE create FILE.DSK as empty SIZE MB disk\n";
     print "  put HOSTFN [GUESTFN]    copy HOSTFN into VM (as GUESTFN)\n";
     print "  get GUESTFN [HOSTFN]    copy GUESTFN out of VM (to HOSTFN)\n";
     print "  help                    print this help message and exit\n";
-    print "Available options:\n";
-    print "  --bochs       Use Bochs as simulator (default)\n";
-    print "  --bochs-dbg   Use Bochs with debugger as simulator\n";
-    print "  --bochs-gdb   Use Bochs with gdb as simulator\n";
-    print "  --qemu        Use qemu as simulator\n";
-    print "  --vmware      Use VMware Workstation as simulator\n";
+    print "Simulator options:\n";
+    print "  --bochs          (default) Use Bochs as simulator\n";
+    print "  --qemu           Use qemu as simulator\n";
+    print "  --gsx            Use VMware GSX Server 3.x as simulator\n";
+    print "Debugger options:\n";
+    print "  --no-debug       (default) No debugger\n";
+    print "  --monitor        Debug with simulator's monitor\n";
+    print "  --gdb            Debug with gdb\n";
+    print "Display options: (default is VGA + serial)\n";
+    print "  -v, --no-vga     No VGA display\n";
+    print "  -s, --no-serial  No serial output\n";
+    print "  -t, --terminal   Display VGA in terminal (Bochs only)\n";
+    print "VM options:\n";
+    print "  -j SEED          Randomize timer interrupts (Bochs only)\n";
+    print "  -m, --mem=MB     Run VM with MB megabytes of physical memory\n";
     exit $exitcode;
 }
 
 sub copy_pad {
     my ($src, $dst, $blocksize) = @_;
-    open (SRC, "<$src") or die "$src: open: $!\n";
-    open (DST, ">$dst") or die "$dst: create: $!\n";
-    my ($size) = 0;
-    my ($input);
-    while (read (SRC, $input, 4096)) {
-	$size += length ($input);
-	print DST $input;
-    }
-    my ($rem) = $size % $blocksize;
-    print DST "\0" x ($blocksize - $rem) if $rem != 0;
-    close (DST);
-    close (SRC);
+    run_command ("dd", "if=$src", "of=$dst", "bs=$blocksize", "conv=sync");
 }
 
 sub create_disk {
     my ($disk, $kb) = @_;
-    open (DISK, ">$disk") or die "$disk: create: $!\n";
-    for (my ($i) = 0; $i < $kb; $i++) {
-	print DISK "\0" x 1024;
-    }
-    close (DISK);
+    run_command ("dd", "if=/dev/zero", "of=$disk", "bs=1024", "count=$kb");
 }
 
 sub run_vm {
     my (@disks) = (undef, undef, undef, undef);
 
+    $sim = "bochs" if !defined $sim;
+    $debug = "no-debug" if !defined $debug;
+    $vga = "window" if !defined $vga;
+
     $disks[0] = "os.dsk";
     $disks[1] = "fs.dsk" if -e "fs.dsk";
     $disks[2] = "scratch.dsk" if -e "scratch.dsk";
@@ -121,13 +149,116 @@ sub run_vm {
     die "$disks[0]: can't find OS disk\n" if ! -e $disks[0];
     write_cmd_line ($disks[0], @_);
 
-    if ($sim eq 'qemu') {
+    if ($sim eq 'bochs') {
+	if ($debug eq 'no-debug') {
+	    $bin = 'bochs';
+	} elsif ($debug eq 'monitor') {
+	    $bin = 'bochs-dbg';
+	} elsif ($debug eq 'gdb') {
+	    $bin = 'bochs-gdb';
+	}
+	$bochsbin = search_path ($bin);
+	$bochsshare = "$bochsbin/../share/bochs";
+	$romimage = "$bochsshare/BIOS-bochs-latest";
+	$vgaromimage = "$bochsshare/VGABIOS-lgpl-latest";
+
+	open (BOCHSRC, ">bochsrc.txt") or die "bochsrc.txt: create: $!\n";
+	print BOCHSRC "romimage: file=$romimage, address=0xf0000\n";
+	print BOCHSRC "vgaromimage: $vgaromimage\n";
+	print BOCHSRC bochs_disk_line ("ata0-master", $disks[0]);
+	print BOCHSRC bochs_disk_line ("ata0-slave", $disks[1]);
+	print BOCHSRC "ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15\n"
+	    if defined ($disks[2]) || defined ($disks[3]);
+	print BOCHSRC bochs_disk_line ("ata1-master", $disks[2]);
+	print BOCHSRC bochs_disk_line ("ata1-slave", $disks[3]);
+	print BOCHSRC "boot: c\n";
+	print BOCHSRC "ips: 1000000\n";
+	print BOCHSRC "clock: sync=none, time0=0\n";
+	print BOCHSRC "megs: $mem\n";
+	print BOCHSRC "log: bochsout.txt\n";
+	if ($vga ne 'terminal') {
+	    print BOCHSRC "com1: enabled=1, dev=/dev/stdout\n"
+		if $serial_out;
+	    print BOCHSRC "display_library: nogui\n"
+		if $vga eq 'none';
+	} else {
+	    print BOCHSRC "display_library: term\n";
+	}
+	close (BOCHSRC);
+	@cmd = ($bin, '-q');
+	push (@cmd, '-j', $jitter) if defined $jitter;
+	run_command_no_die (@cmd);
+    } elsif ($sim eq 'qemu') {
+	print "warning: qemu doesn't support --terminal\n"
+	    if $vga eq 'terminal';
+	print "warning: qemu doesn't support jitter\n"
+	    if defined $jitter;
 	my (@cmd) = ('qemu');
 	push (@cmd, '-hda', $disks[0]) if defined $disks[0];
 	push (@cmd, '-hdb', $disks[1]) if defined $disks[1];
 	push (@cmd, '-hdc', $disks[2]) if defined $disks[2];
 	push (@cmd, '-hdd', $disks[3]) if defined $disks[3];
-	system (@cmd);
+	push (@cmd, '-m', $mem);
+	push (@cmd, '-nographic') if $vga eq 'none';
+	push (@cmd, '-serial', 'stdio') if $serial_out && $vga ne 'none';
+	push (@cmd, '-S') if $debug eq 'monitor';
+	push (@cmd, '-s') if $debug eq 'gdb';
+	run_command (@cmd);
+    } elsif ($sim eq 'gsx') {
+	print "warning: VMware GSX Server doesn't support --$debug\n"
+	    if $debug ne 'no-debug';
+	print "warning: VMware GSX Server doesn't support --no-vga\n"
+	    if $vga eq 'none';
+	print "warning: VMware GSX Server doesn't support --terminal\n"
+	    if $vga eq 'terminal';
+	print "warning: VMware GSX Server doesn't support jitter\n"
+	    if defined $jitter;
+
+	open (VMX, ">pintos.vmx") or die "pintos.vmx: create: $!\n";
+	chmod 0777 & ~umask, "pintos.vmx";
+	print VMX "#! /usr/bin/vmware -G\n";
+	print VMX "config.version = 6\n";
+	print VMX "guestOS = \"linux\"\n";
+	print VMX "floppy0.present = FALSE\n";
+
+	if (! -e 'null.bin') {
+	    open (NULL, ">null.bin") or die "null.bin: create: $!\n";
+	    close (NULL);
+	}
+
+	for (my ($i) = 0; $i < 4; $i++) {
+	    my ($dsk) = $disks[$i];
+	    next if !defined $dsk;
+	    $device = "ide" . int ($i / 2) . ":" . ($i % 2);
+
+	    my ($pln) = $dsk;
+	    $pln =~ s/\.dsk//;
+	    $pln .= ".pln";
+
+	    print VMX "\n$device.present = TRUE\n";
+	    print VMX "$device.deviceType = \"plainDisk\"\n";
+	    print VMX "$device.fileName = \"$pln\"\n";
+
+	    my (%geom) = disk_geometry ($dsk);
+	    open (PLN, ">$pln") or die "$pln: create: $!\n";
+	    print PLN "DRIVETYPE	ide\n";
+	    print PLN "#vm|VERSION	2\n";
+	    print PLN "#vm|TOOLSVERSION	2\n";
+	    print PLN "CYLINDERS	$geom{C}\n";
+	    print PLN "HEADS		$geom{H}\n";
+	    print PLN "SECTORS		$geom{S}\n";
+	    print PLN "#vm|CAPACITY	$geom{CAPACITY}\n";
+	    print PLN "ACCESS \"$dsk\" 0 $geom{CAPACITY}\n";
+	    close (PLN);
+	}
+	close (VMX);
+
+	use Cwd;
+	$vmx = getcwd () . "/pintos.vmx";
+	system ("vmware-cmd -s register $vmx >&/dev/null");
+	system ("vmware-cmd $vmx stop hard >&/dev/null");
+	system ("vmware -l -G -x -q $vmx");
+	system ("vmware-cmd $vmx stop hard >&/dev/null");
     }
 }
 
@@ -139,8 +270,50 @@ sub write_cmd_line {
     die "command line exceeds 128 bytes" if length ($args) > 128;
     $args .= "\0" x (128 - length ($args));
 
+    print "writing command line to $disk...\n";
     open (DISK, "+<$disk") or die "$disk: open: $!\n";
     seek (DISK, 0x17e, 0) or die "$disk: seek: $!\n";
     syswrite (DISK, $args) or die "$disk: write: $!\n";
     close (DISK) or die "$disk: close: $!\n";
 }
+
+sub run_command {
+    print join (' ', @_), "\n";
+    die "command failed\n" if system (@_);
+}
+
+sub run_command_no_die {
+    print join (' ', @_), "\n";
+    system (@_);
+}
+
+sub search_path {
+    my ($target) = @_;
+    for $dir (split (':', $ENV{PATH})) {
+	return $dir if -e "$dir/$target";
+    }
+    die "$target not in PATH\n";
+}
+
+sub bochs_disk_line {
+    my ($device, $file) = @_;
+    return "" if !defined $file;
+    my (%geom) = disk_geometry ($file);
+    return "$device: type=disk, path=$file, mode=flat, "
+	. "cylinders=$geom{C}, heads=$geom{H}, spt=$geom{S}, "
+	. "translation=none\n";
+}
+
+sub disk_geometry {
+    my ($file) = @_;
+    my ($size) = -s $file;
+    die "$file: stat: $!\n" if !defined $size;
+    die "$file: size not a multiple of 512 bytes\n" if $size % 512;
+    $cylinders = int ($size / (512 * 16 * 63));
+    $cylinders++ if $size % (512 * 16 * 63);
+
+    return (CAPACITY => $size / 512,
+	    C => $cylinders,
+	    H => 16,
+	    S => 63);
+}