paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 21:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

used FPC_BIG_ENDIAN instead of POWERPC

Browse Source 
git-svn-id: trunk@8263 -
This commit is contained in:
vincents 2005-12-06 20:09:30 +00:00
parent f9ef53b540
commit c8b8cc06c1
1 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
lcl/lresources.pp
View File

@ -2180,7 +2180,7 @@ end;
function ConvertLRSExtendedToDouble(p: Pointer): Double; function ConvertLRSExtendedToDouble(p: Pointer): Double;
type type
Ti386ExtendedReversed = packed record Ti386ExtendedReversed = packed record
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ExponentAndSign: word; ExponentAndSign: word;
Mantissa: qword; Mantissa: qword;
{$ELSE} {$ELSE}
@ -2195,7 +2195,7 @@ var
Mantissa: qword; Mantissa: qword;
begin begin
System.Move(p^,e,10); System.Move(p^,e,10);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@e,10); ReverseBytes(@e,10);
{$ENDIF} {$ENDIF}
// i386 extended // i386 extended
@ -2210,13 +2210,13 @@ begin
// i386 extended has leading 1, double has not (shl 1) // i386 extended has leading 1, double has not (shl 1)
// i386 has 64 bit, double has 52 bit (shr 12) // i386 has 64 bit, double has 52 bit (shr 12)
{$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT} {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
{$IFDEF ENDIAN_BIG} {$IFDEF FPC_BIG_ENDIAN}
// accessing Mantissa will couse trouble, copy it first // accessing Mantissa will couse trouble, copy it first
System.Move(e.Mantissa, Mantissa, SizeOf(Mantissa)); System.Move(e.Mantissa, Mantissa, SizeOf(Mantissa));
Mantissa := (Mantissa shl 1) shr 12; Mantissa := (Mantissa shl 1) shr 12;
{$ELSE ENDIAN_BIG} {$ELSE FPC_BIG_ENDIAN}
Mantissa := (e.Mantissa shl 1) shr 12; Mantissa := (e.Mantissa shl 1) shr 12;
{$ENDIF ENDIAN_BIG} {$ENDIF FPC_BIG_ENDIAN}
{$ELSE FPC_REQUIRES_PROPER_ALIGNMENT} {$ELSE FPC_REQUIRES_PROPER_ALIGNMENT}
Mantissa := (e.Mantissa shl 1) shr 12; Mantissa := (e.Mantissa shl 1) shr 12;
{$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT} {$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT}
@ -2270,7 +2270,7 @@ function ReadLRSWord(s: TStream): word;
begin begin
Result:=0; Result:=0;
s.Read(Result,2); s.Read(Result,2);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
Result:=((Result and $ff) shl 8) or (Result shr 8); Result:=((Result and $ff) shl 8) or (Result shr 8);
{$ENDIF} {$ENDIF}
end; end;
@ -2279,7 +2279,7 @@ function ReadLRSInteger(s: TStream): integer;
begin begin
Result:=0; Result:=0;
s.Read(Result,4); s.Read(Result,4);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$ENDIF} {$ENDIF}
end; end;
@ -2288,7 +2288,7 @@ function ReadLRSCardinal(s: TStream): cardinal;
begin begin
Result:=0; Result:=0;
s.Read(Result,4); s.Read(Result,4);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$ENDIF} {$ENDIF}
end; end;
@ -2297,7 +2297,7 @@ function ReadLRSInt64(s: TStream): int64;
begin begin
Result:=0; Result:=0;
s.Read(Result,8); s.Read(Result,8);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$ENDIF} {$ENDIF}
end; end;
@ -2306,7 +2306,7 @@ function ReadLRSSingle(s: TStream): Single;
begin begin
Result:=0; Result:=0;
s.Read(Result,4); s.Read(Result,4);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$ENDIF} {$ENDIF}
end; end;
@ -2315,7 +2315,7 @@ function ReadLRSDouble(s: TStream): Double;
begin begin
Result:=0; Result:=0;
s.Read(Result,8); s.Read(Result,8);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$ENDIF} {$ENDIF}
end; end;
@ -2325,12 +2325,14 @@ begin
Result:=0; Result:=0;
{$IFDEF FPC_HAS_TYPE_EXTENDED} {$IFDEF FPC_HAS_TYPE_EXTENDED}
s.Read(Result,10); s.Read(Result,10);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,10); ReverseBytes(@Result,10);
{$ENDIF} {$ENDIF}
{$ELSE} {$ELSE}
{$IFDEF CPUPowerPC} {$IFDEF FPC_BIG_ENDIAN}
Result:=ReadLRSEndianLittleExtendedAsDouble(s); Result:=ReadLRSEndianLittleExtendedAsDouble(s);
{$ELSE}
Debugln('Reading of extended on little endian cpus without 80 bits extended is not yet implemented');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
end; end;
@ -2339,7 +2341,7 @@ function ReadLRSCurrency(s: TStream): Currency;
begin begin
Result:=0; Result:=0;
s.Read(Result,8); s.Read(Result,8);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$ENDIF} {$ENDIF}
end; end;
@ -2352,7 +2354,7 @@ begin
SetLength(Result,Len); SetLength(Result,Len);
if Len>0 then begin if Len>0 then begin
s.Read(Result[1],Len*2); s.Read(Result[1],Len*2);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseByteOrderInWords(PWord(@Result[1]),Len); ReverseByteOrderInWords(PWord(@Result[1]),Len);
{$ENDIF} {$ENDIF}
end; end;
@ -2465,7 +2467,7 @@ end;
procedure WriteLRSWord(s: TStream; const w: word); procedure WriteLRSWord(s: TStream; const w: word);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(w,2); s.Write(w,2);
{$ELSE} {$ELSE}
WriteLRSReversedWord(s,w); WriteLRSReversedWord(s,w);
@ -2474,7 +2476,7 @@ end;
procedure WriteLRSInteger(s: TStream; const i: integer); procedure WriteLRSInteger(s: TStream; const i: integer);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(i,4); s.Write(i,4);
{$ELSE} {$ELSE}
WriteLRS4BytesReversed(s,@i); WriteLRS4BytesReversed(s,@i);
@ -2483,7 +2485,7 @@ end;
procedure WriteLRSCardinal(s: TStream; const c: cardinal); procedure WriteLRSCardinal(s: TStream; const c: cardinal);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(c,4); s.Write(c,4);
{$ELSE} {$ELSE}
WriteLRS4BytesReversed(s,@c); WriteLRS4BytesReversed(s,@c);
@ -2492,7 +2494,7 @@ end;
procedure WriteLRSSingle(s: TStream; const si: Single); procedure WriteLRSSingle(s: TStream; const si: Single);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(si,4); s.Write(si,4);
{$ELSE} {$ELSE}
WriteLRS4BytesReversed(s,@si); WriteLRS4BytesReversed(s,@si);
@ -2501,7 +2503,7 @@ end;
procedure WriteLRSDouble(s: TStream; const d: Double); procedure WriteLRSDouble(s: TStream; const d: Double);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(d,8); s.Write(d,8);
{$ELSE} {$ELSE}
WriteLRS8BytesReversed(s,@d); WriteLRS8BytesReversed(s,@d);
@ -2511,28 +2513,23 @@ end;
procedure WriteLRSExtended(s: TStream; const e: extended); procedure WriteLRSExtended(s: TStream; const e: extended);
begin begin
{$IFDEF FPC_HAS_TYPE_EXTENDED} {$IFDEF FPC_HAS_TYPE_EXTENDED}
{$IFDEF ENDIAN_BIG} {$IFDEF FPC_BIG_ENDIAN}
WriteLRS10BytesReversed(s, @e); WriteLRS10BytesReversed(s, @e);
{$ELSE ENDIAN_LITTLE} {$ELSE}
s.Write(e,10); s.Write(e,10);
{$ENDIF} {$ENDIF}
{$ELSE} {$ELSE}
{$IFDEF CPUPowerPC} {$IFDEF FPC_BIG_ENDIAN}
if SizeOf(e)=10 then
WriteLRS10BytesReversed(s,@e)
else if SizeOf(e)=8 then
WriteLRSEndianBigDoubleAsEndianLittleExtended(s,@e) WriteLRSEndianBigDoubleAsEndianLittleExtended(s,@e)
else begin {$ELSE}
debugln('WARNING: WriteLRSExtended not implemented yet for PowerPC'); debugln('WARNING: WriteLRSExtended not implemented yet for little endian cpu without 80 bits extended');
WriteLRSNull(s,10);
end;
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
end; end;
procedure WriteLRSInt64(s: TStream; const i: int64); procedure WriteLRSInt64(s: TStream; const i: int64);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(i,8); s.Write(i,8);
{$ELSE} {$ELSE}
WriteLRS8BytesReversed(s,@i); WriteLRS8BytesReversed(s,@i);
@ -2541,7 +2538,7 @@ end;
procedure WriteLRSCurrency(s: TStream; const c: Currency); procedure WriteLRSCurrency(s: TStream; const c: Currency);
begin begin
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(c,8); s.Write(c,8);
{$ELSE} {$ELSE}
WriteLRS8BytesReversed(s,@c); WriteLRS8BytesReversed(s,@c);
@ -2554,7 +2551,7 @@ var
begin begin
Size:=length(w); Size:=length(w);
if Size=0 then exit; if Size=0 then exit;
{$IFDEF Endian_Little} {$IFDEF FPC_LITTLE_ENDIAN}
s.Write(w[1], Size * 2); s.Write(w[1], Size * 2);
{$ELSE} {$ELSE}
WriteLRSReversedWords(s,@w[1],Size); WriteLRSReversedWords(s,@w[1],Size);
@ -2604,7 +2601,7 @@ function TLRSObjectReader.ReadIntegerContent: integer;
begin begin
Result:=0; Result:=0;
Read(Result,4); Read(Result,4);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$endif} {$endif}
end; end;
@ -2710,9 +2707,9 @@ begin
Result:=0; Result:=0;
{$ifdef FPC_HAS_TYPE_EXTENDED} {$ifdef FPC_HAS_TYPE_EXTENDED}
Read(Result, 10); Read(Result, 10);
{$ifdef ENDIAN_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result, 10); ReverseBytes(@Result, 10);
{$endif ENDIAN_BIG} {$endif FPC_BIG_ENDIAN}
{$else FPC_HAS_TYPE_EXTENDED} {$else FPC_HAS_TYPE_EXTENDED}
Read(e, 10); Read(e, 10);
Result := ConvertLRSExtendedToDouble(@e); Result := ConvertLRSExtendedToDouble(@e);
@ -2723,7 +2720,7 @@ function TLRSObjectReader.ReadSingle: Single;
begin begin
Result:=0; Result:=0;
Read(Result, 4); Read(Result, 4);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$endif} {$endif}
end; end;
@ -2732,7 +2729,7 @@ function TLRSObjectReader.ReadCurrency: Currency;
begin begin
Result:=0; Result:=0;
Read(Result, 8); Read(Result, 8);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$endif} {$endif}
end; end;
@ -2741,7 +2738,7 @@ function TLRSObjectReader.ReadDate: TDateTime;
begin begin
Result:=0; Result:=0;
Read(Result, 8); Read(Result, 8);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$endif} {$endif}
end; end;
@ -2779,7 +2776,7 @@ function TLRSObjectReader.ReadInt16: SmallInt;
begin begin
Result:=0; Result:=0;
Read(Result, 2); Read(Result, 2);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,2); ReverseBytes(@Result,2);
{$endif} {$endif}
end; end;
@ -2788,7 +2785,7 @@ function TLRSObjectReader.ReadInt32: LongInt;
begin begin
Result:=0; Result:=0;
Read(Result, 4); Read(Result, 4);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,4); ReverseBytes(@Result,4);
{$endif} {$endif}
end; end;
@ -2797,7 +2794,7 @@ function TLRSObjectReader.ReadInt64: Int64;
begin begin
Result:=0; Result:=0;
Read(Result, 8); Read(Result, 8);
{$ifdef Endian_BIG} {$ifdef FPC_BIG_ENDIAN}
ReverseBytes(@Result,8); ReverseBytes(@Result,8);
{$endif} {$endif}
end; end;
@ -3015,7 +3012,7 @@ end;
procedure TLRSObjectWriter.WriteIntegerContent(i: integer); procedure TLRSObjectWriter.WriteIntegerContent(i: integer);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@i,4); ReverseBytes(@i,4);
{$ENDIF} {$ENDIF}
Write(i,4); Write(i,4);
@ -3023,7 +3020,7 @@ end;
procedure TLRSObjectWriter.WriteWordContent(w: word); procedure TLRSObjectWriter.WriteWordContent(w: word);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@w,2); ReverseBytes(@w,2);
{$ENDIF} {$ENDIF}
Write(w,2); Write(w,2);
@ -3031,7 +3028,7 @@ end;
procedure TLRSObjectWriter.WriteInt64Content(i: int64); procedure TLRSObjectWriter.WriteInt64Content(i: int64);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@i,8); ReverseBytes(@i,8);
{$ENDIF} {$ENDIF}
Write(i,8); Write(i,8);
@ -3039,7 +3036,7 @@ end;
procedure TLRSObjectWriter.WriteSingleContent(s: single); procedure TLRSObjectWriter.WriteSingleContent(s: single);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@s,4); ReverseBytes(@s,4);
{$ENDIF} {$ENDIF}
Write(s,4); Write(s,4);
@ -3047,19 +3044,19 @@ end;
procedure TLRSObjectWriter.WriteDoubleContent(d: Double); procedure TLRSObjectWriter.WriteDoubleContent(d: Double);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@d,8); ReverseBytes(@d,8);
{$ENDIF} {$ENDIF}
Write(d,8); Write(d,8);
end; end;
procedure TLRSObjectWriter.WriteExtendedContent(e: Extended); procedure TLRSObjectWriter.WriteExtendedContent(e: Extended);
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
var var
LRSExtended: array[1..10] of byte; LRSExtended: array[1..10] of byte;
{$endif} {$endif}
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
if SizeOf(e)=10 then begin if SizeOf(e)=10 then begin
ReverseBytes(@e,10); ReverseBytes(@e,10);
Write(e,10); Write(e,10);
@ -3073,7 +3070,7 @@ end;
procedure TLRSObjectWriter.WriteCurrencyContent(c: Currency); procedure TLRSObjectWriter.WriteCurrencyContent(c: Currency);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
ReverseBytes(@c,8); ReverseBytes(@c,8);
{$ENDIF} {$ENDIF}
Write(c,8); Write(c,8);
@ -3081,7 +3078,7 @@ end;
procedure TLRSObjectWriter.WriteWideStringContent(ws: WideString); procedure TLRSObjectWriter.WriteWideStringContent(ws: WideString);
begin begin
{$IFDEF Endian_BIG} {$IFDEF FPC_BIG_ENDIAN}
WriteWordsReversed(PWord(@ws[1]),length(ws)); WriteWordsReversed(PWord(@ws[1]),length(ws));
{$ELSE} {$ELSE}
Write(ws[1],length(ws)*2); Write(ws[1],length(ws)*2);