glm94/pdp7-unix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a small i-node calculation bug, and added more debug messages.

Browse Source
This commit is contained in:
Warren Toomey
2016-03-10 14:11:22 +10:00
parent e784132ba4
commit f468628159
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mkfs7
+7 -5
View File
@@ -17,7 +17,7 @@ use constant WORDSPERBLK => 64; # 64 words per block
use constant NUMINODEBLKS => 710; # Blocks 1 to 710 for i-nodes use constant NUMINODEBLKS => 710; # Blocks 1 to 710 for i-nodes
use constant FIRSTINODEBLK => 1; # First i-node block number use constant FIRSTINODEBLK => 1; # First i-node block number
use constant INODESIZE => 12; # Size of an i-node use constant INODESIZE => 12; # Size of an i-node
use constant INODESPERBLK => WORDSPERBLK / INODESIZE; use constant INODESPERBLK => int(WORDSPERBLK / INODESIZE);
use constant DIRENTSIZE => 8; # Size of an directory entry use constant DIRENTSIZE => 8; # Size of an directory entry
use constant DIRENTSPERBLK => WORDSPERBLK / DIRENTSIZE; use constant DIRENTSPERBLK => WORDSPERBLK / DIRENTSIZE;
@@ -82,8 +82,9 @@ sub allocate_blocks {
foreach my $b ( 1 .. $numblocks ) { foreach my $b ( 1 .. $numblocks ) {
push( @blklist, $nextblknum++ ); push( @blklist, $nextblknum++ );
} }
dprint( dprintf(
"Allocated blocks for size $numwords: $blklist[0] .. $blklist[-1]\n"); "Allocated blocks for size %d: %d .. %d (%06o .. %06o)\n",
$numwords, $blklist[0], $blklist[-1], $blklist[0], $blklist[-1]);
return (@blklist); return (@blklist);
} }
@@ -159,6 +160,7 @@ sub fill_inode {
my $i = $offset; my $i = $offset;
foreach my $datablocknum (@blklist) { foreach my $datablocknum (@blklist) {
$Block[$blocknum][ $i + I_DISKPS ] = $datablocknum; $Block[$blocknum][ $i + I_DISKPS ] = $datablocknum;
$i++;
} }
# Deal with the flags and see if it's a large file # Deal with the flags and see if it's a large file
@@ -166,8 +168,8 @@ sub fill_inode {
$flags |= I_LARGE if ( $size > WORDSPERBLK * I_NUMBLKS ); $flags |= I_LARGE if ( $size > WORDSPERBLK * I_NUMBLKS );
$Block[$blocknum][ $offset + I_FLAGS ] = $flags; $Block[$blocknum][ $offset + I_FLAGS ] = $flags;
dprintf( "Fill inum %d: flags %06o uid %06o size %d => blk %d off %d\n", dprintf( "Fill inum %d: flags %06o uid %06o size %d (%06o)=> blk %d off %d\n",
$inum, $flags, $uid, $size, $blocknum, $offset ); $inum, $flags, $uid, $size, $size, $blocknum, $offset );
return ($inum); return ($inum);
} }