+

fpPS4.lpi

@@ -31,7 +31,7 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="99">
+    <Units Count="100">
       <Unit0>
         <Filename Value="fpPS4.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -454,6 +454,10 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="ps4_libSceRandom"/>
       </Unit98>
+      <Unit99>
+        <Filename Value="kernel\ps4_pthread_key.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit99>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

ps4_elf.pas

@@ -1857,6 +1857,14 @@ Procedure OnLoadRelaExport(elf:Telf_file;Info:PRelaInfo;data:Pointer);
 
 begin
 
+ Case Info^.sBind of
+  STB_LOCAL :;
+  STB_GLOBAL:;
+  STB_WEAK  :;
+  else
+   Writeln(StdErr,'invalid sym bingding ',Info^.sBind);
+ end;
+
  case Info^.rType of
   //R_X86_64_NONE    :Writeln('R_X86_64_NONE    ');
   //R_X86_64_PC32    :Writeln('R_X86_64_PC32    ');
@@ -1867,45 +1875,69 @@ begin
 
   R_X86_64_RELATIVE:
    begin
-    _do_set(elf.mMap.pAddr+Info^.Addend);
+    Case Info^.sBind of
+     STB_LOCAL:
+      begin
+       _do_set(elf.mMap.pAddr+Info^.Addend);
+      end;
+     else
+      begin
+       _do_load(elf.mMap.pAddr+Info^.Addend);
+      end;
+    end;
    end;
 
   R_X86_64_TPOFF64:
     begin            //tls_offset????
+     Assert(Info^.sBind=STB_LOCAL);
      _do_load(Pointer(elf.pTls.offset+Info^.value+Info^.Addend));
     end;
 
   R_X86_64_DTPMOD64:
     begin            //tls_index????
+     Assert(Info^.sBind=STB_LOCAL);
      _do_set(Pointer(elf.pTls.index));
     end;
 
   R_X86_64_DTPOFF64:  //tls
     begin
+     Assert(Info^.sBind=STB_LOCAL);
      _do_load(Pointer(Info^.value+Info^.Addend));
     end;
 
   R_X86_64_JUMP_SLOT,
-  R_X86_64_GLOB_DAT,
+  R_X86_64_GLOB_DAT:
+   begin
+    Case Info^.sBind of
+     STB_LOCAL:
+      begin
+       _do_set(elf.mMap.pAddr+Info^.value);
+      end;
+     else
+      begin
+       _do_load(elf.mMap.pAddr+Info^.value);
+      end;
+    end;
+   end;
+
   R_X86_64_64:
    begin
     Case Info^.sBind of
      STB_LOCAL:
-     begin
+      begin
-      _do_set(elf.mMap.pAddr+Info^.value+Info^.Addend);
+       _do_set(elf.mMap.pAddr+Info^.value+Info^.Addend);
-     end;
+      end;
-     STB_GLOBAL,
+     else
-     STB_WEAK:
       begin
        _do_load(elf.mMap.pAddr+Info^.value+Info^.Addend);
       end;
-     else
-      Writeln(StdErr,'invalid sym bingding ',Info^.sBind);
     end;
    end;
 
   else
-   Writeln(StdErr,'rela type not handled ', HexStr(Info^.rType,8));
+   begin
+    Writeln(StdErr,'rela type not handled ', __rtype(Info^.rType));
+   end;
 
  end;
 
@@ -1932,6 +1964,7 @@ Procedure OnLoadRelaImport(elf:Telf_file;Info:PRelaInfo;data:Pointer);
   Import:=(Info^.shndx=SHN_UNDEF);
 
   if not Import then Exit;
+  Assert(Info^.value=0);
 
   IInfo:=Default(TResolveImportInfo);
 
@@ -1970,38 +2003,92 @@ Procedure OnLoadRelaImport(elf:Telf_file;Info:PRelaInfo;data:Pointer);
    IInfo.sBind :=Info^.sBind;
    IInfo.sType :=Info^.sType;
    nSymVal:=TResolveImportCb(PPointer(data)[0])(elf,@IInfo,PPointer(data)[1]);
-   if nSymVal<>nil then nSymVal:=nSymVal+Info^.Addend;
+
+   if (nSymVal<>nil) then
+   if (Info^.rType=R_X86_64_64) then
+   begin
+    nSymVal:=nSymVal+Info^.Addend;
+   end;
+
    _do_set(nSymVal);
   end;
 
  end;
 
 begin
+
+ Case Info^.sBind of
+  STB_LOCAL :;
+  STB_GLOBAL:;
+  STB_WEAK  :;
+  else
+   Writeln(StdErr,'invalid sym bingding ',Info^.sBind);
+ end;
+
  case Info^.rType of
   R_X86_64_TPOFF64:
     begin            //tls_offset????
-     _do_load(Pointer(elf.pTls.offset+Info^.value+Info^.Addend));
+     Assert(Info^.sBind=STB_LOCAL);
     end;
 
-  R_X86_64_DTPMOD64:;
+  R_X86_64_RELATIVE:
+   begin
+    Case Info^.sBind of
+     STB_LOCAL:
+      begin
+       //
+      end;
+     else
+      begin
+       _do_load(elf.mMap.pAddr+Info^.Addend);
+      end;
+    end;
+   end;
+
+  R_X86_64_DTPMOD64:
+    begin            //tls_index????
+     Assert(Info^.sBind=STB_LOCAL);
+    end;
 
   R_X86_64_DTPOFF64:  //tls
     begin
-     _do_load(Pointer(Info^.value+Info^.Addend));
+     Assert(Info^.sBind=STB_LOCAL);
     end;
 
   R_X86_64_JUMP_SLOT,
-  R_X86_64_GLOB_DAT,
+  R_X86_64_GLOB_DAT:
+   begin
+    Case Info^.sBind of
+     STB_LOCAL:
+      begin
+       //
+      end;
+     else
+      begin
+       _do_load(elf.mMap.pAddr+Info^.value);
+      end;
+    end;
+   end;
+
   R_X86_64_64:
    begin
     Case Info^.sBind of
-     STB_GLOBAL,
+     STB_LOCAL:
-     STB_WEAK:
+      begin
+       //
+      end;
+     else
       begin
        _do_load(elf.mMap.pAddr+Info^.value+Info^.Addend);
       end;
     end;
    end;
+
+  else
+   begin
+    Writeln(StdErr,'rela type not handled ', __rtype(Info^.rType));
+   end;
+
  end;
 end;
 
@@ -2097,6 +2184,14 @@ const
 
 begin
 
+ Case Info^.sBind of
+  STB_LOCAL :;
+  STB_GLOBAL:;
+  STB_WEAK  :;
+  else
+   FWriteln('invalid sym bingding '+__nBind(Info^.sBind));
+ end;
+
  case Info^.rType of
   //R_X86_64_NONE    :FWriteln('R_X86_64_NONE');
   //R_X86_64_PC32    :FWriteln('R_X86_64_PC32');
@@ -2139,13 +2234,12 @@ begin
       begin
         _do_load(Pointer(Info^.value)+Info^.Addend);
       end;
-     else
+     else;
-        FWriteln('invalid sym bingding '+__nBind(Info^.sBind));
     end;
    end;
 
   else
-   FWriteln('rela type not handled '+HexStr(Info^.rType,8));
+   FWriteln('rela type not handled '+__rtype(Info^.rType));
 
  end;
 

sys/sys_signal.pas

@@ -355,6 +355,46 @@ begin
  Result:=0;
 end;
 
+function _get_sig_str(signum:Integer):RawByteString;
+begin
+ case signum of
+  SIGHUP   :Result:='SIGHUP';
+  SIGINT   :Result:='SIGINT';
+  SIGQUIT  :Result:='SIGQUIT';
+  SIGILL   :Result:='SIGILL';
+  SIGTRAP  :Result:='SIGTRAP';
+  SIGABRT  :Result:='SIGABRT';
+  SIGEMT   :Result:='SIGEMT';
+  SIGFPE   :Result:='SIGFPE';
+  SIGKILL  :Result:='SIGKILL';
+  SIGBUS   :Result:='SIGBUS';
+  SIGSEGV  :Result:='SIGSEGV';
+  SIGSYS   :Result:='SIGSYS';
+  SIGPIPE  :Result:='SIGPIPE';
+  SIGALRM  :Result:='SIGALRM';
+  SIGTERM  :Result:='SIGTERM';
+  SIGURG   :Result:='SIGURG';
+  SIGSTOP  :Result:='SIGSTOP';
+  SIGTSTP  :Result:='SIGTSTP';
+  SIGCONT  :Result:='SIGCONT';
+  SIGCHLD  :Result:='SIGCHLD';
+  SIGTTIN  :Result:='SIGTTIN';
+  SIGTTOU  :Result:='SIGTTOU';
+  SIGIO    :Result:='SIGIO';
+  SIGXCPU  :Result:='SIGXCPU';
+  SIGXFSZ  :Result:='SIGXFSZ';
+  SIGVTALRM:Result:='SIGVTALRM';
+  SIGPROF  :Result:='SIGPROF';
+  SIGWINCH :Result:='SIGWINCH';
+  SIGINFO  :Result:='SIGINFO';
+  SIGUSR1  :Result:='SIGUSR1';
+  SIGUSR2  :Result:='SIGUSR2';
+  SIGTHR   :Result:='SIGTHR';
+  else
+   Str(signum,Result);
+  end;
+end;
+
 function __sigaction(signum:Integer;act,oldact:p_sigaction_t):Integer;
 var
  idx:DWORD;
@@ -362,6 +402,8 @@ var
 begin
  if not _SIG_VALID_32(signum) then Exit(EINVAL);
 
+ Writeln('sigaction:',_get_sig_str(signum));
+
  if (act=nil) then
  begin
   tmp:=Default(sigaction_t);