paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 14:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ added upper limits to the heapmin and heapmax values set by the $M directive

Browse Source 
git-svn-id: trunk@28056 -
This commit is contained in:
nickysn 2014-06-25 09:33:04 +00:00
parent 9d5c2717c8
commit 0d4edf118e
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/scandir.pas
View File

@ -703,7 +703,27 @@ unit scandir;
procedure dir_memory; procedure dir_memory;
var var
l : longint; l : longint;
heapsize_limit: longint;
maxheapsize_limit: longint;
begin begin
{$if defined(i8086)}
if current_settings.x86memorymodel in x86_far_data_models then
begin
heapsize_limit:=655360;
maxheapsize_limit:=655360;
end
else
begin
heapsize_limit:=65520;
maxheapsize_limit:=65520;
end;
{$elseif defined(cpu16bitaddr)}
heapsize_limit:=65520;
maxheapsize_limit:=65520;
{$else}
heapsize_limit:=high(heapsize);
maxheapsize_limit:=high(maxheapsize);
{$endif}
current_scanner.skipspace; current_scanner.skipspace;
l:=current_scanner.readval; l:=current_scanner.readval;
if (l>=1024) if (l>=1024)
@ -723,14 +743,14 @@ unit scandir;
current_scanner.skipspace; current_scanner.skipspace;
l:=current_scanner.readval; l:=current_scanner.readval;
if l>=1024 then if l>=1024 then
heapsize:=l; heapsize:=min(l,heapsize_limit);
if c=',' then if c=',' then
begin begin
current_scanner.readchar; current_scanner.readchar;
current_scanner.skipspace; current_scanner.skipspace;
l:=current_scanner.readval; l:=current_scanner.readval;
if l>=heapsize then if l>=heapsize then
maxheapsize:=l maxheapsize:=min(l,maxheapsize_limit)
else else
Message(scan_w_heapmax_lessthan_heapmin); Message(scan_w_heapmax_lessthan_heapmin);
end; end;