|
@@ -168,8 +168,9 @@ begin
|
|
if Count>4*sizeof(ptruint)-1 then
|
|
if Count>4*sizeof(ptruint)-1 then
|
|
begin
|
|
begin
|
|
v:=(value shl 16) or value;
|
|
v:=(value shl 16) or value;
|
|
- if sizeof(ptruint)=8 then
|
|
|
|
- v:=(v shl 32) or v;
|
|
|
|
|
|
+{$ifdef CPU64}
|
|
|
|
+ v:=(v shl 32) or v;
|
|
|
|
+{$endif CPU64}
|
|
{ Align on native pointer size }
|
|
{ Align on native pointer size }
|
|
aligncount:=(PtrUInt(pdest) and (sizeof(PtrUInt)-1)) shr 1;
|
|
aligncount:=(PtrUInt(pdest) and (sizeof(PtrUInt)-1)) shr 1;
|
|
dec(count,aligncount);
|
|
dec(count,aligncount);
|
|
@@ -211,8 +212,9 @@ begin
|
|
if Count>4*sizeof(ptruint)-1 then
|
|
if Count>4*sizeof(ptruint)-1 then
|
|
begin
|
|
begin
|
|
v:=value;
|
|
v:=value;
|
|
- if sizeof(ptruint)=8 then
|
|
|
|
- v:=(v shl 32) or v;
|
|
|
|
|
|
+{$ifdef CPU64}
|
|
|
|
+ v:=(v shl 32) or v;
|
|
|
|
+{$endif CPU64}
|
|
{ Align on native pointer size }
|
|
{ Align on native pointer size }
|
|
aligncount:=(PtrUInt(pdest) and (sizeof(PtrUInt)-1)) shr 2;
|
|
aligncount:=(PtrUInt(pdest) and (sizeof(PtrUInt)-1)) shr 2;
|
|
dec(count,aligncount);
|
|
dec(count,aligncount);
|
|
@@ -617,7 +619,6 @@ end;
|
|
{$ifndef FPC_SYSTEM_HAS_COMPARECHAR0}
|
|
{$ifndef FPC_SYSTEM_HAS_COMPARECHAR0}
|
|
function CompareChar0(Const buf1,buf2;len:SizeInt):SizeInt;
|
|
function CompareChar0(Const buf1,buf2;len:SizeInt):SizeInt;
|
|
var
|
|
var
|
|
- aligncount : sizeint;
|
|
|
|
psrc,pdest,pend : pbyte;
|
|
psrc,pdest,pend : pbyte;
|
|
b : ptrint;
|
|
b : ptrint;
|
|
begin
|
|
begin
|