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

* partially reverted 13571, I didn't get it work on W7 x64 in win32 mode

Browse Source 
* use $ffffffff to signal an unsed TLSKey, 0 is a valid TLSKey and could be returned by Windows in theory

git-svn-id: trunk@13608 -
This commit is contained in:
florian 2009-08-29 20:46:06 +00:00
parent e9e6439345
commit a8c6d9ec3a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rtl/win/systhrd.inc
View File

@ -72,8 +72,8 @@ CONST
const
threadvarblocksize : dword = 0;
var
TLSKey : Dword;
const
TLSKey : DWord = $ffffffff;
procedure SysInitThreadvar(var offset : dword;size : dword);
begin
@ -104,16 +104,17 @@ CONST
var
dataindex : pointer;
errorsave : dword;
begin
{$ifdef win32}
begin
{$ifdef dummy}
{ it least in the on windows 7 x64, this still doesn't not work, fs:(0x2c) is
self referencing on this system (FK) }
asm
movl TLSKey,%edx
movl $0x2c,%eax
movl %fs:(%eax),%eax
movl %fs:(0x2c),%eax
orl %eax,%eax
jnz .LAddressInEAX
movl $0x18,%eax
movl %fs:(%eax),%eax
{ this works on Windows 7, but I don't know if it works on other OSes (FK) }
movl %fs:(0x18),%eax
movl 0xe10(%eax,%edx,4),%eax
jmp .LToDataIndex
.LAddressInEAX:
@ -186,11 +187,12 @@ CONST
procedure SysInitMultithreading;
begin
{ do not check IsMultiThread, as program could have altered it, out of Delphi habit }
if TLSKey = 0 then
if TLSKey=$ffffffff then
begin
{ We're still running in single thread mode, setup the TLS }
TLSKey:=TlsAlloc;
InitThreadVars(@SysRelocateThreadvar);
{ allocate the thread vars for the main thread }
IsMultiThread:=true;
end;
end;
@ -200,7 +202,7 @@ CONST
if IsMultiThread then
begin
TlsFree(TLSKey);
TLSKey := 0;
TLSKey:=$ffffffff;
end;
end;