our (@gets); # Files to copy out of the VM.
our ($as_ref); # Reference to last addition to @gets or @puts.
our (@kernel_args); # Arguments to pass to kernel.
-our (%disks) = (OS => {FILENAME => 'os.dsk'}, # Disks to give VM.
+our (%disks) = (OS => {DEF_FN => 'os.dsk'}, # Disks to give VM.
FS => {DEF_FN => 'fs.dsk'},
SCRATCH => {DEF_FN => 'scratch.dsk'},
SWAP => {DEF_FN => 'swap.dsk'});
sub find_disks {
for my $disk (values %disks) {
# If there's no assigned file name but the default file exists,
- # assign the default file.
- $disk->{FILENAME} = $disk->{DEF_FN}
- if !defined ($disk->{FILENAME}) && -e $disk->{DEF_FN};
+ # try to assign a default file name.
+ if (!defined ($disk->{FILENAME})) {
+ for my $try_fn ($disk->{DEF_FN}, "build/" . $disk->{DEF_FN}) {
+ $disk->{FILENAME} = $try_fn, last
+ if -e $try_fn;
+ }
+ }
# If there's no file name, we're done.
next if !defined ($disk->{FILENAME});
my ($mb) = $disk->{FILENAME};
undef $disk->{FILENAME};
- my ($cylinder) = 1024 * 504;
- my ($bytes) = $mb * ($cylinder * 2);
- $bytes = int (($bytes + $cylinder - 1) / $cylinder) * $cylinder;
- extend_disk ($disk, $bytes);
+ my ($cyl_size) = 512 * 16 * 63;
+ extend_disk ($disk, ceil ($mb * 2) * $cyl_size);
} else {
# The file must exist and have nonzero size.
-e $disk->{FILENAME} or die "$disk->{FILENAME}: stat: $!\n";
}
# Warn about (potentially) missing disks.
+ die "Cannot find OS disk\n" if !defined $disks{OS}{FILENAME};
if (my ($project) = `pwd` =~ /\b(threads|userprog|vm|filesys)\b/) {
if ((grep ($project eq $_, qw (userprog vm filesys)))
&& !defined ($disks{FS}{FILENAME})) {
# line for attaching it to $device.
sub print_bochs_disk_line {
my ($device, $iface) = @_;
- my ($file) = $disks_by_iface[$iface]{FILENAME};
+ my ($disk) = $disks_by_iface[$iface];
+ my ($file) = $disk->{FILENAME};
if (defined $file) {
- my (%geom) = disk_geometry ($file);
+ my (%geom) = disk_geometry ($disk);
print BOCHSRC "$device: type=disk, path=$file, mode=flat, ";
print BOCHSRC "cylinders=$geom{C}, heads=$geom{H}, spt=$geom{S}, ";
print BOCHSRC "translation=none\n";
push (@cmd, $option, $disks_by_iface[$iface]{FILENAME})
if defined $disks_by_iface[$iface]{FILENAME};
}
- push (@cmd, '-m', $mem);
+ push (@cmd, '-m', $mem, '-nics', '0');
push (@cmd, '-nographic') if $vga eq 'none';
push (@cmd, '-serial', 'stdio') if $serial_out && $vga ne 'none';
push (@cmd, '-S') if $debug eq 'monitor';
EOF
for (my ($i) = 0; $i < 4; $i++) {
- my ($dsk) = $disks_by_iface[$i]{FILENAME};
+ my ($disk) = $disks_by_iface[$i];
+ my ($dsk) = $disk->{FILENAME};
next if !defined $dsk;
my ($pln) = $dsk;
$device.fileName = "$pln"
EOF
- my (%geom) = disk_geometry ($dsk);
+ my (%geom) = disk_geometry ($disk);
open (PLN, ">", $pln) or die "$pln: create: $!\n";
print PLN <<EOF;
DRIVETYPE ide
# Examines $file and returns a valid IDE disk geometry for it, as a
# hash.
sub disk_geometry {
- my ($file) = @_;
+ my ($disk) = @_;
+ my ($file) = $disk->{FILENAME};
my ($size) = -s $file;
die "$file: stat: $!\n" if !defined $size;
die "$file: size not a multiple of 512 bytes\n" if $size % 512;
- my ($cylinders) = int ($size / (512 * 16 * 63));
- $cylinders++ if $size % (512 * 16 * 63);
+ my ($cyl_size) = 512 * 16 * 63;
+ my ($cylinders) = ceil ($size / $cyl_size);
+ extend_disk ($disk, $cylinders * $cyl_size) if $size % $cyl_size;
return (CAPACITY => $size / 512,
C => $cylinders,