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

Hopefully correct fix for ReplayToken TSettings record writes

Browse Source 
git-svn-id: trunk@21605 -
This commit is contained in:
pierre 2012-06-14 10:14:24 +00:00
parent 1d4862f3c1
commit 41248ea4f7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/scanner.pas
View File

@ -2297,12 +2297,12 @@ In case not, the value returned can be arbitrary.
procedure tscannerfile.tokenwriteenum(var b;size : longint); procedure tscannerfile.tokenwriteenum(var b;size : longint);
begin begin
replaytokenbuf.write(b,size); recordtokenbuf.write(b,size);
end; end;
procedure tscannerfile.tokenwriteset(var b;size : longint); procedure tscannerfile.tokenwriteset(var b;size : longint);
begin begin
replaytokenbuf.write(b,size); recordtokenbuf.write(b,size);
end; end;
@ -2387,10 +2387,10 @@ In case not, the value returned can be arbitrary.
begin begin
{ WARNING all those fields need to be in the correct { WARNING all those fields need to be in the correct
order otherwise cross_endian PPU reading will fail } order otherwise cross_endian PPU reading will fail }
sizepos:=replaytokenbuf.pos; sizepos:=recordtokenbuf.pos;
size:=0; size:=0;
tokenwritesizeint(size); tokenwritesizeint(size);
startpos:=replaytokenbuf.pos; startpos:=recordtokenbuf.pos;
with asettings do with asettings do
begin begin
tokenwritelongint(alignment.procalign); tokenwritelongint(alignment.procalign);
@ -2433,15 +2433,15 @@ In case not, the value returned can be arbitrary.
tokenwriteenum(minfpconstprec,sizeof(tfloattype)); tokenwriteenum(minfpconstprec,sizeof(tfloattype));
replaytokenbuf.write(byte(disabledircache),1); recordtokenbuf.write(byte(disabledircache),1);
{$if defined(ARM) or defined(AVR)} {$if defined(ARM) or defined(AVR)}
tokenwriteenum(controllertype,sizeof(tcontrollertype)); tokenwriteenum(controllertype,sizeof(tcontrollertype));
{$endif defined(ARM) or defined(AVR)} {$endif defined(ARM) or defined(AVR)}
endpos:=replaytokenbuf.pos; endpos:=recordtokenbuf.pos;
size:=endpos-startpos; size:=endpos-startpos;
replaytokenbuf.seek(sizepos); recordtokenbuf.seek(sizepos);
tokenwritesizeint(size); tokenwritesizeint(size);
replaytokenbuf.seek(endpos); recordtokenbuf.seek(endpos);
end; end;
end; end;
@ -2468,7 +2468,7 @@ In case not, the value returned can be arbitrary.
writetoken(t); writetoken(t);
recordtokenbuf.write(s,1); recordtokenbuf.write(s,1);
copy_size:=sizeof(current_settings)-sizeof(pointer); copy_size:=sizeof(current_settings)-sizeof(pointer);
recordtokenbuf.write(current_settings,copy_size); tokenwritesettings(current_settings,copy_size);
last_settings:=current_settings; last_settings:=current_settings;
end; end;