pcomp/sasm.pas

@@ -2041,17 +2041,20 @@ begin
 		errorExit2('Unrecognized directive', lastToken.tokenText);
 end;
 
-procedure readImage(filename:string;size:integer);
+procedure readImage(filename:string);
 var f:InputFileType;
     c:char;
     i:integer;
+    size:integer;
 begin
+	openFileWithDefault(f, filename);
+	size := filesize(f);
+
 	pc := pc + size;
 	bytesCount := bytesCount + size;
 
 	if pass = 2 then
 	begin
-		openFileWithDefault(f, filename);
 
 		for i := 1 to size do
 		begin
@@ -2059,14 +2062,14 @@ begin
 			write(outfile,c);
 		end;
 
-		close(f);
 	end;
+
+	close(f);
 end;
 
 procedure parseMetaDirective;
 var filename:string;
     sym:TreeDataRef;
-    size:integer;
 begin
 	readNextToken;
 	if lastToken.tokenText = '%INCLUDE' then
@@ -2099,8 +2102,7 @@ begin
 	begin
 		filename := curToken.tokenText;
 		readNextToken;
-		size := parseExpression;
+		readImage(filename);
-		readImage(filename, size);
 	end
 	else
 		errorExit2('Invalid meta directive', lastToken.tokenText);