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

Merged revisions 1096-1098 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@1110 -
This commit is contained in:
florian 2005-09-18 11:04:26 +00:00
parent ef7f30e45a
commit a8cf3cc6a9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/i386/ra386int.pas
View File

@ -710,16 +710,20 @@ Unit Ra386int;
while (actasmtoken=AS_DOT) do while (actasmtoken=AS_DOT) do
begin begin
Consume(AS_DOT); Consume(AS_DOT);
if actasmtoken=AS_ID then if actasmtoken in [AS_BYTE,AS_ID,AS_WORD,AS_DWORD,AS_QWORD] then
s:=s+'.'+actasmpattern; begin
if not Consume(AS_ID) then s:=s+'.'+actasmpattern;
consume(actasmtoken);
end
else
begin begin
Consume(AS_ID);
RecoverConsume(true); RecoverConsume(true);
break; break;
end; end;
end; end;
if not GetRecordOffsetSize(s,offset,size) then if not GetRecordOffsetSize(s,offset,size) then
Message(asmr_e_building_record_offset); Message(asmr_e_building_record_offset);
end; end;
@ -1484,10 +1488,11 @@ Unit Ra386int;
expr : string; expr : string;
tempreg : tregister; tempreg : tregister;
typesize, typesize,
l : aint; l,k : aint;
hl : tasmlabel; hl : tasmlabel;
toffset, toffset,
tsize : aint; tsize : aint;
tempstr : string;
begin begin
expr:=''; expr:='';
repeat repeat
@ -1648,6 +1653,8 @@ Unit Ra386int;
if oper.opr.typ in [OPR_REFERENCE,OPR_LOCAL] then if oper.opr.typ in [OPR_REFERENCE,OPR_LOCAL] then
oper.SetSize(typesize,true); oper.SetSize(typesize,true);
end; end;
else
oper.SetSize(typesize,true);
end; end;
end end
else else