--- Tape.pm	2008/04/12 13:54:53	191
+++ Tape.pm	2009/09/03 10:23:27	215
@@ -37,29 +37,23 @@
 my $c_1 = 0;
 my $mask = 1;
 
-my $bits = '';
-
 sub read_tape {
 	my $self = shift;
-	if ( ! $self->tape ) {
-		_warn "please load tape!";
-		return 0;
-	}
+
 	my $pos = $self->tape_pos;
 	my $tape = $self->tape;
-	if ( $pos > length( $tape ) ) {
-		_warn "end of tape [$pos]";
-		return -1;
+
+	if ( ! $tape ) {
+		_warn "please load tape!";
+		return 0;
 	}
 
 	if ( $c_0 ) {
 		$c_0--;
-		$bits .= ".";
 		return 0;
 	}
 	if ( $c_1 ) {
 		$c_1--;
-		$bits .= "X";
 		return 255;
 	}
 
@@ -68,14 +62,20 @@
 		$pos++;
 		$self->tape_pos( $pos );
 		$mask = 1;
+	}
 
-		warn "# $bits\n";
-		$bits = '';
-	};
+	my $byte = 0;
+	my $tape_len = length( $tape );
+
+	if ( $pos <= $tape_len ) {
+		$byte = ord( substr($self->tape,$pos,1) );
+	} elsif ( $pos  == $tape_len ) {
+		_warn "end of tape [$pos]";
+	}
 
-	my $byte = ord( substr($self->tape,$pos,1) );
 	my $bit = $byte & $mask;
-	warn sprintf("tape pos %d 0x%04x mask %02x and %02x = %d\n", $pos, $pos, $mask, $byte, $bit); # if $self->trace;
+
+	warn sprintf("## tape pos %d/%d %.02f%% 0x%04x = %02x\n", $pos, $tape_len, ($pos * 100) / $tape_len, $pos, $byte) if $mask == 1;
 
 	( $c_0, $c_1 ) = ( 0x17, 0x17 );
 	( $c_0, $c_1 ) = ( 0x30, 0x30 ) if $bit;
@@ -100,20 +100,23 @@
 
 =head2 load_tape
 
-  $self->load_tape( '/path/to/file' );
+  $self->load_tape( '/path/to/file', $position );
 
 =cut
 
 sub load_tape {
 	my $self = shift;
 	my $path = shift || return;
+	my $pos = shift || 0;
+
+	return unless -e $path;
 
 	my $tape = read_file( $path ) || confess "can't load $path: $!";
 	$self->tape_path( $path );
 
-	$self->tape_pos( 0 );
+	$self->tape_pos( $pos );
 	$self->tape( $tape );
-	warn "loaded tape $path ", -s $path, " bytes\n";
+	warn "loaded tape $path ", -s $path, " bytes at $pos\n";
 	return 1;
 }
 
@@ -132,7 +135,7 @@
 
 	return sprintf(
 		"tape file: %s with %d 0x%x bytes, current position: %d 0x%x",
-		$self->tape_path, $size, $size, $self->pos, $self->pos,
+		$self->tape_path, $size, $size, $self->tape_pos, $self->tape_pos,
 	);
 }