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

* fixed bug1093 and other string -> chararray conversion bugs

Browse Source 
(merged from fixes branch)
This commit is contained in:
Jonas Maebe 2000-08-09 11:30:21 +00:00
parent 3aab08cba8
commit 77d566f4fc
1 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
compiler/cg386cnv.pas
View File

@ -504,50 +504,81 @@ implementation
procedure second_string_to_chararray(var pto,pfrom : ptree;convtyp : tconverttype); procedure second_string_to_chararray(var pto,pfrom : ptree;convtyp : tconverttype);
var var
pushedregs: tpushed;
l1 : pasmlabel; l1 : pasmlabel;
hr : preference; hr : preference;
arrsize, strtype: longint;
regstopush: byte;
begin begin
with parraydef(pto^.resulttype)^ do
arrsize := highrange-lowrange+1;
if (pfrom^.treetype = stringconstn) and
{ pfrom^.length+1 since there's always a terminating #0 character (JM) }
(pfrom^.length+1 >= arrsize) then
begin
inc(pto^.location.reference.offset);
exit;
end;
clear_location(pto^.location);
pto^.location.loc := LOC_REFERENCE;
gettempofsizereference(arrsize,pto^.location.reference);
regstopush := $ff;
remove_non_regvars_from_loc(pfrom^.location,regstopush);
pushusedregisters(pushedregs,regstopush);
emit_push_lea_loc(pto^.location,false);
case pstringdef(pfrom^.resulttype)^.string_typ of case pstringdef(pfrom^.resulttype)^.string_typ of
st_shortstring : st_shortstring :
begin begin
inc(pto^.location.reference.offset); { 0 means shortstring }
strtype := 0;
del_reference(pfrom^.location.reference);
emit_push_lea_loc(pfrom^.location,true);
ungetiftemp(pfrom^.location.reference);
end; end;
st_ansistring : st_ansistring :
begin begin
clear_location(pto^.location); { 1 means ansistring }
pto^.location.loc:=LOC_REFERENCE; strtype := 1;
reset_reference(pto^.location.reference);
getlabel(l1);
case pfrom^.location.loc of case pfrom^.location.loc of
LOC_CREGISTER,LOC_REGISTER: LOC_CREGISTER,LOC_REGISTER:
pto^.location.reference.base:=pfrom^.location.register; begin
ungetregister(pfrom^.location.register);
emit_push_loc(pfrom^.location);
end;
LOC_MEM,LOC_REFERENCE: LOC_MEM,LOC_REFERENCE:
begin begin
pto^.location.reference.base:=getregister32;
emit_ref_reg(A_MOV,S_L,newreference(pfrom^.location.reference),
pto^.location.reference.base);
del_reference(pfrom^.location.reference); del_reference(pfrom^.location.reference);
emit_push_loc(pfrom^.location);
ungetiftemp(pfrom^.location.reference);
end; end;
end; end;
emit_const_reg(A_CMP,S_L,0,pto^.location.reference.base);
emitjmp(C_NZ,l1);
new(hr);
reset_reference(hr^);
hr^.symbol:=newasmsymbol('FPC_EMPTYCHAR');
emit_ref_reg(A_LEA,S_L,hr,pto^.location.reference.base);
emitlab(l1);
end; end;
st_longstring: st_longstring:
begin begin
{!!!!!!!} {!!!!!!!}
{ 2 means longstring, but still needs support in FPC_STR_TO_CHARARRAY,
which is in i386.inc and/or generic.inc (JM) }
strtype := 2;
internalerror(8888); internalerror(8888);
end; end;
st_widestring: st_widestring:
begin begin
{!!!!!!!} {!!!!!!!}
{ 3 means widestring, but still needs support in FPC_STR_TO_CHARARRAY,
which is in i386.inc and/or generic.inc (JM) }
strtype := 3;
internalerror(8888); internalerror(8888);
end; end;
end; end;
push_int(arrsize);
push_int(strtype);
emitcall('FPC_STR_TO_CHARARRAY');
popusedregisters(pushedregs);
end; end;
@ -1536,7 +1567,11 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.4 2000-08-02 07:05:32 jonas Revision 1.5 2000-08-09 11:30:21 jonas
* fixed bug1093 and other string -> chararray conversion bugs
(merged from fixes branch)
Revision 1.4 2000/08/02 07:05:32 jonas
* fixed ie(10) when using -Or and shortstring -> ansistring conversions * fixed ie(10) when using -Or and shortstring -> ansistring conversions
(or when using a lot of ss -> as conversions in one statement, the (or when using a lot of ss -> as conversions in one statement, the
source was freed only *after* pushusedregisters($ff), which means its source was freed only *after* pushusedregisters($ff), which means its