|
@@ -1,4 +1,4 @@
|
|
|
- {
|
|
|
+{
|
|
|
$Id$
|
|
|
Copyright (c) 1998-2002 by Florian Klaempfl
|
|
|
|
|
@@ -777,11 +777,11 @@ implementation
|
|
|
if not(is_constcharnode(left) and is_constcharnode(right)) then
|
|
|
begin
|
|
|
inserttypeconv(left,cshortstringtype);
|
|
|
-{$ifndef powerpc}
|
|
|
+{$ifndef callparatemp}
|
|
|
hp := genaddsstringcharoptnode(self);
|
|
|
result := hp;
|
|
|
exit;
|
|
|
-{$endif powerpc}
|
|
|
+{$endif callparatemp}
|
|
|
end;
|
|
|
end;
|
|
|
end
|
|
@@ -1781,7 +1781,7 @@ implementation
|
|
|
end
|
|
|
else
|
|
|
begin
|
|
|
-{$ifndef powerpc}
|
|
|
+{$ifndef callparatemp}
|
|
|
{ can create a call which isn't handled by callparatemp }
|
|
|
if canbeaddsstringcharoptnode(self) then
|
|
|
begin
|
|
@@ -1790,7 +1790,7 @@ implementation
|
|
|
exit;
|
|
|
end
|
|
|
else
|
|
|
-{$endif powerpc}
|
|
|
+{$endif callparatemp}
|
|
|
begin
|
|
|
{ Fix right to be shortstring }
|
|
|
if is_char(right.resulttype.def) then
|
|
@@ -1799,7 +1799,7 @@ implementation
|
|
|
firstpass(right);
|
|
|
end;
|
|
|
end;
|
|
|
-{$ifndef powerpc}
|
|
|
+{$ifndef callparatemp}
|
|
|
{ can create a call which isn't handled by callparatemp }
|
|
|
if canbeaddsstringcsstringoptnode(self) then
|
|
|
begin
|
|
@@ -1807,7 +1807,7 @@ implementation
|
|
|
pass_1 := hp;
|
|
|
exit;
|
|
|
end;
|
|
|
-{$endif powerpc}
|
|
|
+{$endif callparatemp}
|
|
|
end;
|
|
|
{ otherwise, let addstring convert everything }
|
|
|
result := first_addstring;
|
|
@@ -1958,7 +1958,12 @@ begin
|
|
|
end.
|
|
|
{
|
|
|
$Log$
|
|
|
- Revision 1.88 2003-05-23 22:57:38 jonas
|
|
|
+ Revision 1.89 2003-05-24 21:12:57 florian
|
|
|
+ * if something doesn't work with callparatemp, the define callparatemp
|
|
|
+ should be used because other processors with reigster calling conventions
|
|
|
+ depend on this as well
|
|
|
+
|
|
|
+ Revision 1.88 2003/05/23 22:57:38 jonas
|
|
|
- disable addoptnodes for powerpc, because they can generate calls in
|
|
|
pass_2, so -dcallparatemp can't detect them as nested calls
|
|
|
|
|
@@ -2174,4 +2179,4 @@ end.
|
|
|
with string operations
|
|
|
* adapted some routines to use the new cg methods
|
|
|
|
|
|
-}
|
|
|
+}
|